Unity 8

Merge lp:~mzanetti/unity8/launcher-hiding-fix into lp:unity8

  1. launcher-hiding-fix
  2. Merge into trunk
Proposed by Michael Zanetti
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 2771
Merged at revision: 2825
Proposed branch: lp:~mzanetti/unity8/launcher-hiding-fix
Merge into: lp:unity8
Diff against target: 48 lines (+15/-1)
3 files modified
qml/Components/EdgeBarrier.qml (+1/-0)
qml/Launcher/Launcher.qml (+1/-1)
tests/qmltests/Launcher/tst_Launcher.qml (+13/-0)
To merge this branch: bzr merge lp:~mzanetti/unity8/launcher-hiding-fix
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve
Albert Astals Cid (community) Approve
Review via email: mp+315033@code.launchpad.net

Commit message

prevent hiding the launcher when the mouse hover event is eaten by the EdgePushArea

Description of the change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
no
 * 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 :

PASSED: Continuous integration, rev:2770
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2946/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3843
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2236
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2236
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3871
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3714
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3714/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3714
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3714/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3714
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3714/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3714
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3714/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3714
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3714/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3714
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3714/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) 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
Albert Astals Cid (aacid) wrote :

Note: was top approved.

Text conflict in tests/qmltests/Launcher/tst_Launcher.qml
1 conflicts encountered.

review: Needs Fixing
lp:~mzanetti/unity8/launcher-hiding-fix updated
2771. By Michael Zanetti

merge trunk

Revision history for this message
Michael Zanetti (mzanetti) wrote :

> Note: was top approved.
>
> Text conflict in tests/qmltests/Launcher/tst_Launcher.qml
> 1 conflicts encountered.

merged

Revision history for this message
Albert Astals Cid (aacid) wrote :

Still good

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

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

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

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

PASSED: Continuous integration, rev:2771
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3040/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3955
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2312
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2312
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3983
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3828
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3828/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3828
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3828/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3828
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3828/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3828
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3828/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3828
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3828/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3828
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3828/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3040/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/Components/EdgeBarrier.qml'
2--- qml/Components/EdgeBarrier.qml 2016-09-07 12:41:18 +0000
3+++ qml/Components/EdgeBarrier.qml 2017-01-26 09:09:40 +0000
4@@ -30,6 +30,7 @@
5 property int edge: Qt.LeftEdge
6
7 readonly property alias progress: controller.progress
8+ readonly property alias containsMouse: controller.containsMouse
9
10 property Item target: parent
11 function push(amount) { controller.push(amount); }
12
13=== modified file 'qml/Launcher/Launcher.qml'
14--- qml/Launcher/Launcher.qml 2017-01-24 07:42:24 +0000
15+++ qml/Launcher/Launcher.qml 2017-01-26 09:09:40 +0000
16@@ -414,7 +414,7 @@
17 target: panel.dismissTimer
18 onTriggered: {
19 if (root.autohideEnabled && !root.lockedVisible) {
20- if (!panel.preventHiding) {
21+ if (!edgeBarrier.containsMouse && !panel.preventHiding) {
22 root.state = ""
23 } else {
24 panel.dismissTimer.restart()
25
26=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
27--- tests/qmltests/Launcher/tst_Launcher.qml 2017-01-24 07:42:24 +0000
28+++ tests/qmltests/Launcher/tst_Launcher.qml 2017-01-26 09:09:40 +0000
29@@ -1480,6 +1480,19 @@
30 launcher.available = true;
31 }
32
33+ function test_hoverOnEdgeBarrerPreventsHiding() {
34+ revealByEdgePush();
35+
36+ // Make sure the mouse is on the very left edge (on top of the barrier)
37+ mouseMove(root, 1, root.height / 2);
38+
39+ // trigger the hide timer
40+ compare(fakeDismissTimer.running, true);
41+ fakeDismissTimer.triggered();
42+
43+ compare(launcher.state, "visibleTemporary");
44+ }
45+
46 function test_hintOnSizeChange() {
47 var oldSize = launcher.panelWidth;
48 launcher.maxPanelX = -launcher.panelWidth;

Subscribers

People subscribed via source and target branches