Merge lp:~aacid/unity8/launcher_touch_menu_interaction into lp:unity8

Proposed by Albert Astals Cid
Status: Superseded
Proposed branch: lp:~aacid/unity8/launcher_touch_menu_interaction
Merge into: lp:unity8
Diff against target: 358 lines (+132/-55)
7 files modified
qml/Panel/Panel.qml (+26/-2)
qml/Panel/PanelBar.qml (+1/-2)
qml/Panel/PanelItemRow.qml (+3/-23)
qml/Panel/PanelMenu.qml (+35/-24)
qml/Shell.qml (+9/-1)
tests/qmltests/Panel/tst_Panel.qml (+2/-2)
tests/qmltests/tst_Shell.qml (+56/-1)
To merge this branch: bzr merge lp:~aacid/unity8/launcher_touch_menu_interaction
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve
Lukáš Tinkl (community) Needs Fixing
Michael Zanetti (community) Needs Fixing
Review via email: mp+319331@code.launchpad.net

This proposal has been superseded by a proposal from 2017-03-16.

Commit message

Improve Launcher ←→ touch menu interaction

Needs to move the label from PanelItemRow to Panel because how clipping works in those items (and fixes some other problems too)

If launcher is locked visible:
     * Touch menus show shifted to the right to not overlap
     * Showing the app drawer closes the touch menus
     * Showing the touch menus closes the app drawer

If launcher is not locked visible:
     * Showing the launcher closes the touch menus
     * Showing the touch menus closes the launcher

Description of the change

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

FAILED: Continuous integration, rev:2840
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3312/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4360
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2606
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2606
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4388
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4221
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4221/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4221
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4221/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4221
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4221/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4221
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4221/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4221
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4221/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4221
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4221/artifact/output/*zip*/output.zip

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

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

PASSED: Continuous integration, rev:2841
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3317/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4365
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2611
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2611
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4393
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4226
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4226/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4226
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4226/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4226
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4226/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4226
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4226/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4226
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4226/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4226
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4226/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

2 small inline comments.

Wouldn't mind a test that runs once with launcher.lockedVisible and once without it, then checks if the offset of the menu is what it should be.

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

I've tested it, seems it's working fine.

2842. By Albert Astals Cid

Review tweaks

2843. By Albert Astals Cid

Test for touch menu position

2844. By Albert Astals Cid

Test for launcher/appdrawer hiding the touch menus

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

PASSED: Continuous integration, rev:2842
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3320/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4370
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2615
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2615
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4398
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4231
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4231/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4231
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4231/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4231
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4231/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4231
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4231/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4231
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4231/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4231
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4231/artifact/output/*zip*/output.zip

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

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

FAILED: Continuous integration, rev:2844
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3324/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4374
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2617
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2617
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4402
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4235
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4235/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4235
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4235/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4235
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4235/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4235
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4235/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4235
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4235/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4235
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4235/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

looks like the new test fails in CI

review: Needs Fixing
2845. By Albert Astals Cid

waitForRenderint to stabilize test

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

FAILED: Continuous integration, rev:2844
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3326/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4376
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2620
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2620
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4404
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4237
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4237/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4237
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4237/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4237
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4237/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4237
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4237/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4237
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4237/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4237
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4237/artifact/output/*zip*/output.zip

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

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

FAILED: Continuous integration, rev:2845
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3329/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4380
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2622
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2622
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4408
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4241
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4241/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4241
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4241/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4241
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4241/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4241
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4241/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4241
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4241/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4241
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4241/artifact/output/*zip*/output.zip

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

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

PASSED: Continuous integration, rev:2845
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3334/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4385
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2624
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2624
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4413
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4246
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4246/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4246
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4246/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4246
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4246/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4246
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4246/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4246
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4246/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4246
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4246/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
2846. By Albert Astals Cid

Merge

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

PASSED: Continuous integration, rev:2846
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3348/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4404
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2641
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2641
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4432
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4269
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4269/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4269
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4269/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4269
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4269/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4269
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4269/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4269
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4269/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4269
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4269/artifact/output/*zip*/output.zip

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

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

Not entirely sure yet, but I think this branch breaks the panel window title for apps that don't have menus at all - like browser here: https://imgur.com/a/ivPVa

Notice the text being cut from both sides

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

Wonder what's going on here, it seems that it happens only with the browser app? :/

2847. By Albert Astals Cid

Move the Panel "title" from PanelItemRow to Panel

2848. By Albert Astals Cid

Adapt tests

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

FAILED: Continuous integration, rev:2847
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3398/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4477
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2687
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2687
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4505
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4332
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4332/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4332
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4332/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4332
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4332/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4332
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4332/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4332
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4332/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4332
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4332/artifact/output/*zip*/output.zip

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

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

Tests have regressed a bit

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

FAILED: Continuous integration, rev:2848
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3400/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4481
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2692
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2692
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4509
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4336
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4336/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4336
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4336/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4336
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4336/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4336
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4336/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4336
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4336/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4336
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4336/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
2849. By Albert Astals Cid

panelTitle changed parents

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

> Tests have regressed a bit

Should be fixed with r2849.

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

PASSED: Continuous integration, rev:2849
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3408/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4489
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2698
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2698
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4517
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4344
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4344/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4344
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4344/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4344
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4344/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4344
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4344/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4344
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4344/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4344
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4344/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
2850. By Albert Astals Cid

Merge lp:~aacid/unity8/disabledMenus

2851. By Albert Astals Cid

Fix tests?

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Panel/Panel.qml'
2--- qml/Panel/Panel.qml 2017-03-08 09:53:35 +0000
3+++ qml/Panel/Panel.qml 2017-03-16 09:08:32 +0000
4@@ -38,6 +38,7 @@
5 property real expandedPanelHeight: units.gu(7)
6 property real indicatorMenuWidth: width
7 property real applicationMenuWidth: width
8+ property alias applicationMenuContentX: __applicationMenus.menuContentX
9
10 property alias applicationMenus: __applicationMenus
11 property alias indicators: __indicators
12@@ -250,6 +251,7 @@
13 PanelMenu {
14 id: __applicationMenus
15
16+ x: menuContentX
17 model: registeredMenuModel.model
18 width: root.applicationMenuWidth
19 minimizedPanelHeight: root.minimizedPanelHeight
20@@ -258,6 +260,7 @@
21 alignment: Qt.AlignLeft
22 enableHint: !callHint.active && !fullscreenMode
23 showOnClick: false
24+ adjustDragHandleSizeToContents: false
25 panelColor: panelAreaBackground.color
26
27 onShowTapped: {
28@@ -266,8 +269,7 @@
29 }
30 }
31
32- showRowTitle: !expanded
33- rowTitle: PanelState.title
34+ hideRow: !expanded
35 rowItemDelegate: ActionItem {
36 id: actionItem
37 property int ownIndex: index
38@@ -308,6 +310,28 @@
39 }
40 }
41
42+ Label {
43+ id: rowLabel
44+ objectName: "panelTitle"
45+ anchors {
46+ left: parent.left
47+ leftMargin: units.gu(1)
48+ right: __indicators.left
49+ rightMargin: units.gu(1)
50+ }
51+ height: root.minimizedPanelHeight
52+ verticalAlignment: Text.AlignVCenter
53+ elide: Text.ElideRight
54+ maximumLineCount: 1
55+ fontSize: "medium"
56+ font.weight: Font.Medium
57+ color: Theme.palette.selected.backgroundText
58+ opacity: __applicationMenus.visible && !__applicationMenus.expanded ? 1 : 0
59+ visible: opacity != 0
60+ Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.SnapDuration } }
61+ text: PanelState.title
62+ }
63+
64 PanelMenu {
65 id: __indicators
66 objectName: "indicators"
67
68=== modified file 'qml/Panel/PanelBar.qml'
69--- qml/Panel/PanelBar.qml 2017-01-16 08:51:52 +0000
70+++ qml/Panel/PanelBar.qml 2017-03-16 09:08:32 +0000
71@@ -30,8 +30,7 @@
72 property real lateralPosition: -1
73 property int alignment: Qt.AlignRight
74
75- property alias showRowTitle: row.showRowTitle
76- property alias rowTitle: row.rowTitle
77+ property alias hideRow: row.hideRow
78 property alias rowItemDelegate: row.delegate
79
80 implicitWidth: flickable.contentWidth
81
82=== modified file 'qml/Panel/PanelItemRow.qml'
83--- qml/Panel/PanelItemRow.qml 2017-01-24 17:34:19 +0000
84+++ qml/Panel/PanelItemRow.qml 2017-03-16 09:08:32 +0000
85@@ -20,11 +20,10 @@
86
87 Item {
88 id: root
89- implicitWidth: showRowTitle && !expanded ? rowTitle != "" ? rowLabel.width : 0 : row.width
90+ implicitWidth: row.width
91 implicitHeight: units.gu(3)
92
93- property bool showRowTitle: false
94- property alias rowTitle: rowLabel.text
95+ property bool hideRow: false
96 property QtObject model: null
97 property real overFlowWidth: width
98 property bool expanded: false
99@@ -138,31 +137,12 @@
100 d.previousItem = currentItem;
101 }
102
103- Label {
104- id: rowLabel
105- objectName: "panelTitle"
106- anchors {
107- left: parent.left
108- leftMargin: units.gu(1)
109- verticalCenter: parent.verticalCenter
110- }
111- width: implicitWidth + units.gu(2)
112- elide: Text.ElideRight
113- maximumLineCount: 1
114- fontSize: "medium"
115- font.weight: Font.Medium
116- color: Theme.palette.selected.backgroundText
117- opacity: showRowTitle ? 1 : 0
118- visible: opacity != 0
119- Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.SnapDuration } }
120- }
121-
122 ListView {
123 id: row
124 objectName: "panelRow"
125 orientation: ListView.Horizontal
126 model: root.model
127- opacity: showRowTitle ? 0 : 1
128+ opacity: hideRow ? 0 : 1
129 // dont set visible on basis of opacity; otherwise width will not be calculated correctly
130 anchors {
131 top: parent.top
132
133=== modified file 'qml/Panel/PanelMenu.qml'
134--- qml/Panel/PanelMenu.qml 2017-01-16 08:51:52 +0000
135+++ qml/Panel/PanelMenu.qml 2017-03-16 09:08:32 +0000
136@@ -32,11 +32,12 @@
137 property real openedHeight: units.gu(71)
138 property bool enableHint: true
139 property bool showOnClick: true
140+ property bool adjustDragHandleSizeToContents: true
141 property color panelColor: theme.palette.normal.background
142+ property real menuContentX: 0
143
144 property alias alignment: bar.alignment
145- property alias rowTitle: bar.rowTitle
146- property alias showRowTitle: bar.showRowTitle
147+ property alias hideRow: bar.hideRow
148 property alias rowItemDelegate: bar.rowItemDelegate
149 property alias pageDelegate: content.pageDelegate
150
151@@ -45,7 +46,7 @@
152 readonly property bool partiallyOpened: unitProgress > 0 && unitProgress < 1.0
153 readonly property bool fullyClosed: unitProgress == 0
154 readonly property alias expanded: bar.expanded
155- readonly property int barWidth: Math.min(bar.width, bar.implicitWidth)
156+ readonly property int barWidth: adjustDragHandleSizeToContents ? Math.min(bar.width, bar.implicitWidth) : bar.width
157
158 signal showTapped()
159
160@@ -77,33 +78,42 @@
161
162 shown: false
163 height: minimizedPanelHeight
164- clip: root.partiallyOpened
165
166 onUnitProgressChanged: d.updateState()
167
168- // eater
169- MouseArea {
170- anchors.fill: content
171- hoverEnabled: true
172- acceptedButtons: Qt.AllButtons
173- onWheel: wheel.accepted = true;
174- enabled: root.state != "initial"
175- visible: content.visible
176- }
177-
178- MenuContent {
179- id: content
180- objectName: "menuContent"
181-
182+ Item {
183 anchors {
184 left: parent.left
185 right: parent.right
186 top: bar.bottom
187- }
188- height: openedHeight - bar.height - handle.height
189- model: root.model
190- visible: root.unitProgress > 0
191- currentMenuIndex: bar.currentItemIndex
192+ bottom: parent.bottom
193+ }
194+ clip: root.partiallyOpened
195+
196+ // eater
197+ MouseArea {
198+ anchors.fill: content
199+ hoverEnabled: true
200+ acceptedButtons: Qt.AllButtons
201+ onWheel: wheel.accepted = true;
202+ enabled: root.state != "initial"
203+ visible: content.visible
204+ }
205+
206+ MenuContent {
207+ id: content
208+ objectName: "menuContent"
209+
210+ anchors {
211+ left: parent.left
212+ right: parent.right
213+ top: parent.top
214+ }
215+ height: openedHeight - bar.height - handle.height
216+ model: root.model
217+ visible: root.unitProgress > 0
218+ currentMenuIndex: bar.currentItemIndex
219+ }
220 }
221
222 Handle {
223@@ -217,8 +227,9 @@
224 objectName: "showDragHandle"
225 anchors.bottom: parent.bottom
226 anchors.left: alignment == Qt.AlignLeft ? parent.left : undefined
227+ anchors.leftMargin: -root.menuContentX
228 anchors.right: alignment == Qt.AlignRight ? parent.right : undefined
229- width: root.barWidth // show handle should only cover panel items.
230+ width: root.barWidth + root.menuContentX // show handle should only cover panel items.
231 height: minimizedPanelHeight
232 direction: Direction.Downwards
233 enabled: !root.shown && root.available
234
235=== modified file 'qml/Shell.qml'
236--- qml/Shell.qml 2017-02-21 16:21:34 +0000
237+++ qml/Shell.qml 2017-03-16 09:08:32 +0000
238@@ -500,6 +500,7 @@
239 expandedPanelHeight: units.gu(7)
240 indicatorMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
241 applicationMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
242+ applicationMenuContentX: launcher.lockedVisible ? launcher.panelWidth : 0
243
244 indicators {
245 hides: [launcher]
246@@ -567,7 +568,14 @@
247 }
248 onShownChanged: {
249 if (shown) {
250- panel.indicators.hide()
251+ panel.indicators.hide();
252+ panel.applicationMenus.hide();
253+ }
254+ }
255+ onDrawerShownChanged: {
256+ if (drawerShown) {
257+ panel.indicators.hide();
258+ panel.applicationMenus.hide();
259 }
260 }
261 onFocusChanged: {
262
263=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
264--- tests/qmltests/Panel/tst_Panel.qml 2017-02-17 21:03:24 +0000
265+++ tests/qmltests/Panel/tst_Panel.qml 2017-03-16 09:08:32 +0000
266@@ -769,7 +769,7 @@
267 panel.mode = "staged";
268 mouseEmulation.checked = false;
269
270- var appTitle = findChild(panel.applicationMenus, "panelTitle"); verify(appTitle);
271+ var appTitle = findChild(panel, "panelTitle"); verify(appTitle);
272 var appMenuRow = findChild(panel.applicationMenus, "panelRow"); verify(appMenuRow);
273 var appMenuBar = findChild(panel, "menuBar"); verify(appMenuBar);
274
275@@ -787,7 +787,7 @@
276 panel.mode = "windowed";
277 mouseEmulation.checked = false;
278
279- var appTitle = findChild(panel.applicationMenus, "panelTitle"); verify(appTitle);
280+ var appTitle = findChild(panel, "panelTitle"); verify(appTitle);
281 var appMenuRow = findChild(panel.applicationMenus, "panelRow"); verify(appMenuRow);
282 var appMenuBar = findChild(panel, "menuBar"); verify(appMenuBar);
283
284
285=== modified file 'tests/qmltests/tst_Shell.qml'
286--- tests/qmltests/tst_Shell.qml 2017-03-08 09:54:00 +0000
287+++ tests/qmltests/tst_Shell.qml 2017-03-16 09:08:32 +0000
288@@ -2848,7 +2848,7 @@
289 loadShell(data.tag);
290
291 var panel = findChild(shell, "panel"); verify(panel);
292- var panelTitle = findChild(panel.applicationMenus, "panelTitle"); verify(panelTitle);
293+ var panelTitle = findChild(panel, "panelTitle"); verify(panelTitle);
294 compare(panelTitle.visible, false, "Panel title should not be visible when greeter is shown");
295
296 swipeAwayGreeter();
297@@ -2941,6 +2941,61 @@
298 tryCompare(topLevelSurfaceList.applicationAt(0), "appId", "dialer-app");
299 }
300
301+ function test_touchMenuPosition_data() {
302+ return [
303+ { tag: "launcher locked", lockLauncher: true },
304+ { tag: "launcher not locked", lockLauncher: false }
305+ ];
306+ }
307+
308+ function test_touchMenuPosition(data) {
309+ loadShell("desktop");
310+ shell.usageScenario = "desktop";
311+ waitForRendering(shell);
312+ swipeAwayGreeter();
313+
314+ var panel = findChild(shell, "panel");
315+ var launcher = testCase.findChild(shell, "launcher");
316+ launcher.lockedVisible = data.lockLauncher;
317+ if (data.lockLauncher) {
318+ compare(panel.applicationMenus.x, launcher.panelWidth);
319+ } else {
320+ compare(panel.applicationMenus.x, 0);
321+ }
322+ }
323+
324+ function test_touchMenuHidesOnLauncherAppDrawer_data() {
325+ return [
326+ { tag: "launcher locked", lockLauncher: true },
327+ { tag: "launcher not locked", lockLauncher: false }
328+ ];
329+ }
330+
331+ function test_touchMenuHidesOnLauncherAppDrawer(data) {
332+ loadShell("desktop");
333+ shell.usageScenario = "desktop";
334+ waitForRendering(shell);
335+ swipeAwayGreeter();
336+
337+ var panel = findChild(shell, "panel");
338+ var launcher = testCase.findChild(shell, "launcher");
339+ launcher.lockedVisible = data.lockLauncher;
340+
341+ waitForRendering(panel.applicationMenus);
342+
343+ if (data.lockLauncher) {
344+ panel.applicationMenus.show();
345+ tryCompare(panel.applicationMenus, "fullyOpened", true);
346+ launcher.openDrawer();
347+ } else {
348+ tryCompare(launcher, "shown", false);
349+ panel.applicationMenus.show();
350+ tryCompare(panel.applicationMenus, "fullyOpened", true);
351+ launcher.switchToNextState("visible");
352+ }
353+ tryCompare(panel.applicationMenus, "fullyClosed", true);
354+ }
355+
356 function test_doubleClickPanelRestoresWindow() {
357 loadShell("desktop");
358 shell.usageScenario = "desktop";

Subscribers

People subscribed via source and target branches