Unity 8

Merge lp://qastaging/~dandrader/unity8/cursorConfinement into lp://qastaging/unity8

cursorConfinement
Merge into trunk

Proposed by Daniel d'Andrada on 2016-08-25

Status:

Superseded

Proposed branch:

lp://qastaging/~dandrader/unity8/cursorConfinement

Merge into:

lp://qastaging/unity8

Diff against target:

576 lines (+181/-25)

19 files modified

CMakeLists.txt (+1/-1)
debian/control (+6/-4)
plugins/Cursor/MousePointer.cpp (+42/-1)
plugins/Cursor/MousePointer.h (+10/-0)
plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt (+3/-1)
plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.cpp (+2/-1)
plugins/Ubuntu/DownloadDaemonListener/DownloadTracker.h (+2/-1)
plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.cpp (+2/-2)
plugins/Ubuntu/DownloadDaemonListener/interface/downloadtrackeradaptor.h (+71/-4)
plugins/Ubuntu/DownloadDaemonListener/interface/metatypes.h (+3/-6)
qml/Dash/Previews/PreviewProgress.qml (+5/-1)
qml/Shell.qml (+2/-0)
qml/Stages/AbstractStage.qml (+3/-0)
qml/Stages/DecoratedWindow.qml (+2/-0)
qml/Stages/DesktopStage.qml (+6/-0)
tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp (+3/-1)
tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.h (+2/-1)
tests/mocks/Unity/Application/MirSurface.h (+2/-0)
tests/qmltests/Dash/Previews/tst_PreviewProgress.qml (+14/-1)

To merge this branch:

bzr merge lp://qastaging/~dandrader/unity8/cursorConfinement

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)		2016-08-25	Approve on 2016-08-30
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-08-30
Review via email: mp+303986@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2016-09-01.

Commit message

Implement cursor confinement

Description of the change

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~dandrader/unity-api/cursorConfinement/+merge/303984
https://code.launchpad.net/~dandrader/qtmir/cursorConfinement/+merge/303987

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

For testing, build and run this application: lp:~dandrader/+junk/confinedCursor

Clicking on its big button will turn cursor confinement on/off

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable

* If you changed the UI, has there been a design review?
Not applicable

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-25:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2039/rebuild

review: Needs Fixing (continuous-integration)

lp://qastaging/~dandrader/unity8/cursorConfinement updated on 2016-08-26

2601. By Alfonso Sanchez-Beato on 2016-08-26: Make sure we emit sounds when taking a screenshot even after media-hub
has restarted (LP: #1544477) (LP: #1544477)
2602. By CI Train Bot Account on 2016-08-26: Releasing 8.14+16.10.20160826-0ubuntu1

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-08-26:

+ itemConfiningMouseCursor: ...

I'd prefer this being an inline binding, instead of the returns. How about sth like:

itemConfiningMouseCursor: priv.focusedAppDelegate && priv.focusedAppDelegate.surface &&
priv.focusedAppDelegate.surface.confinesMousePointer ?
priv.focusedAppDelegate.clientAreaItem : null;

review: Needs Information

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-08-26:

On 26/08/2016 11:20, Lukáš Tinkl wrote:
> Review: Needs Information
>
> + itemConfiningMouseCursor: ...
>
> I'd prefer this being an inline binding, instead of the returns. How about sth like:
>
> itemConfiningMouseCursor: priv.focusedAppDelegate && priv.focusedAppDelegate.surface &&
> priv.focusedAppDelegate.surface.confinesMousePointer ?
> priv.focusedAppDelegate.clientAreaItem : null;
>
>
Done.

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-26:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2042/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-08-30:

What happens, when the window moves under cursor (e.g. press Ctrl+Super+Right to semi maximize on the right edge)? Will the cursor be still captured correctly?

review: Needs Information

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-08-30:

> What happens, when the window moves under cursor (e.g. press Ctrl+Super+Right
> to semi maximize on the right edge)? Will the cursor be still captured
> correctly?

I'm guessing what you mean is this:

1 - mouse is confined to a non-fullscreen window, positioned over the left side of the desktop
2 - You press Ctrl+Super+Right

What will happen is that the cursor will jump to be within the window client area the next time you start to move the mouse.

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-08-30:

> > What happens, when the window moves under cursor (e.g. press
> Ctrl+Super+Right
> > to semi maximize on the right edge)? Will the cursor be still captured
> > correctly?
>
> I'm guessing what you mean is this:
>
> 1 - mouse is confined to a non-fullscreen window, positioned over the left
> side of the desktop
> 2 - You press Ctrl+Super+Right
>
> What will happen is that the cursor will jump to be within the window client
> area the next time you start to move the mouse.

Yeah I kinda expected that... do you think it makes sense to improve the situation when the window gets moved/resized under the cursor?

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-08-30:

Explanation, I know you can't resize the window when the cursor is confined, but you're still able to resize it/ move it using for example the touch controls, that's my main concern.

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-08-30:

FAILED: Continuous integration, rev:2602
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2064/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/2710/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2738
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2611
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2611
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2611

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2064/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-08-30:

On 30/08/2016 11:39, Lukáš Tinkl wrote:
> [...]
> Yeah I kinda expected that... do you think it makes sense to improve the situation when the window gets moved/resized under the cursor?

Don't think this corner case is worth the extra complexity involved.
It's not simply tracking changes to the x,y,width,height of the client
area (eg: its x,y won't change when the window moves around). Would have
to add a signal to AbstractStage that would say "hey, client area
changed its geometry in scene coords" and in Shell.qml I would wire it
to some update function in Cursor. Then in DesktopStage I would emit
this signal whenever the focused window changed its geometry.

But if you think this is relevant enough, I can look into it.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-08-30:

On 30/08/2016 11:40, Lukáš Tinkl wrote:
> Explanation, I know you can't resize the window when the cursor is confined, but you're still able to resize it/ move it using for example the touch controls, that's my main concern.

Have you tried moving or resizing the window with touch while at the
same time moving the cursor with a mouse/touchpad? It's a disaster :)

Maybe we should report a bug on it...

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-08-30:

> On 30/08/2016 11:39, Lukáš Tinkl wrote:
> > [...]
> > Yeah I kinda expected that... do you think it makes sense to improve the
> situation when the window gets moved/resized under the cursor?
>
> Don't think this corner case is worth the extra complexity involved.
> It's not simply tracking changes to the x,y,width,height of the client
> area (eg: its x,y won't change when the window moves around). Would have
> to add a signal to AbstractStage that would say "hey, client area
> changed its geometry in scene coords" and in Shell.qml I would wire it
> to some update function in Cursor. Then in DesktopStage I would emit
> this signal whenever the focused window changed its geometry.
>
> But if you think this is relevant enough, I can look into it.

I don't know... I guess not since this is highly dependent on the intended use case (I assume this is meant mainly for fullscreen apps, like games?)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-08-30:

Alright then, this sounds good for the initial iteration

* Did you perform an exploratory manual test run of the code change and any related functionality?

Yes, with the demo provided (no real app using this to my knowledge)

* Did CI run pass? If not, please explain why.

No, due to unity-api bump

review: Approve

lp://qastaging/~dandrader/unity8/cursorConfinement updated on 2016-09-06

2603. By CI Train Bot Account on 2016-08-31

Resync trunk.