Unity 8

Merge lp:~lukas-kde/unity8/touch-control-buttons into lp:unity8

  1. touch-control-buttons
  2. Merge into trunk
Proposed by Lukáš Tinkl
Status: Merged
Approved by: Michał Sawicz
Approved revision: 2730
Merged at revision: 2757
Proposed branch: lp:~lukas-kde/unity8/touch-control-buttons
Merge into: lp:unity8
Prerequisite: lp:~mzanetti/unity8/appdrawer
Diff against target: 40 lines (+18/-1)
2 files modified
qml/Stage/WindowControlsOverlay.qml (+1/-1)
tests/qmltests/Stage/tst_DesktopStage.qml (+17/-0)
To merge this branch: bzr merge lp:~lukas-kde/unity8/touch-control-buttons
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve
Josh Arenson Approve
Review via email: mp+312819@code.launchpad.net

Commit message

Fix touch window controls being unreachable when the overlay is being displayed

Description of the change

Fix lp:1648167 - Touch window controls dismiss the touch overlay instead

Added a regression test

* Are there any related MPs required for this MP to build/function as expected? Please list.

Yes, the prereq

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

Yes

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

N/A

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

N/A

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2728
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2680/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3522/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3550
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3397/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3397/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3397/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3397/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3397/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3397/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Josh Arenson (josharenson) wrote :

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

* Did CI run pass? If not, please explain why.
No, but all relevant tests pass locally. Seems to just be a dependency issue.This is a simple fix that works, so I approve.

review: Approve
Revision history for this message
Josh Arenson (josharenson) wrote :

Jumped the gun a bit, apologies. What was the nature of the original failure? The added test case seems to pass without the fix.

review: Needs Information
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2728
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2685/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3533/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3561
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3408/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3408
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3408/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3408/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3408
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3408/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3408/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3408
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3408/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2728
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2687/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3535
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2038
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2038
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3563
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3410
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3410/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3410
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3410/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3410
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3410/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3410
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3410/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3410
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3410/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3410
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3410/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

> Jumped the gun a bit, apologies. What was the nature of the original failure?
> The added test case seems to pass without the fix.

Thanks for pointing out the test, it was a timing issue. The original failure was that with the touch overlay on, it was not possible to click on the min/max/close button while it was being displayed. In fact, it was covered by the InverseMouseArea, so this is now fixed.

Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

I adjusted the test to reflect the reality better, the fix itself is still the same

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2729
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2689/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3537
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2039
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2039
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3565
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3412
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3412/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3412
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3412/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3412
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3412/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3412
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3412/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3412
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3412/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3412
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3412/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Josh Arenson (josharenson) wrote :

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

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

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2729
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2775/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3635/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3663
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3505/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3505/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3505/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3505/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3505/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3505/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2729
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2779/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3639/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3667
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3512/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3512/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3512/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3512/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3512/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3512/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2730
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2801/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3666/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3694
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3539/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3539/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3539/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3539/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3539/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3539/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2730
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2809/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3676
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2107
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2107
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3704
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3548/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3548/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3548/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3548/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3548/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3548
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3548/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Stage/WindowControlsOverlay.qml'
2--- qml/Stage/WindowControlsOverlay.qml 2016-11-30 19:24:02 +0000
3+++ qml/Stage/WindowControlsOverlay.qml 2016-12-27 22:10:24 +0000
4@@ -184,7 +184,7 @@
5 }
6
7 overlayTimer.stop();
8- mouse.accepted = root.contains(mapToItem(root.target, mouse.x, mouse.y));
9+ mouse.accepted = root.contains(mapToItem(root.target.clientAreaItem, mouse.x, mouse.y));
10 }
11 propagateComposedEvents: true
12 }
13
14=== modified file 'tests/qmltests/Stage/tst_DesktopStage.qml'
15--- tests/qmltests/Stage/tst_DesktopStage.qml 2016-12-12 16:45:09 +0000
16+++ tests/qmltests/Stage/tst_DesktopStage.qml 2016-12-27 22:10:24 +0000
17@@ -662,6 +662,23 @@
18 tryCompare(overlay, "visible", false);
19 }
20 }
21+
22+ function test_windowControlsOverlayMaximizeButtonReachable() {
23+ var facebookAppDelegate = startApplication("facebook-webapp");
24+ verify(facebookAppDelegate);
25+ var overlay = findChild(facebookAppDelegate, "windowControlsOverlay");
26+ verify(overlay);
27+
28+ multiTouchTap([0, 1, 2], facebookAppDelegate);
29+ tryCompare(overlay, "visible", true);
30+
31+ var maxButton = findChild(facebookAppDelegate, "maximizeWindowButton");
32+ tryCompare(maxButton, "visible", true);
33+ wait(700); // there's a lot of behaviors on different decoration elements, make sure they're all settled
34+ mouseClick(maxButton);
35+ tryCompare(facebookAppDelegate, "maximized", true);
36+ }
37+
38 function test_dashHasNoCloseButton() {
39 var dashAppDelegate = startApplication("unity8-dash");
40 verify(dashAppDelegate);

Subscribers

People subscribed via source and target branches