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

Proposed by Albert Astals Cid
Status: Merged
Approved by: Lukáš Tinkl
Approved revision: 2810
Merged at revision: 2848
Proposed branch: lp:~aacid/unity8/cursorUpdateOnWindowClose
Merge into: lp:unity8
Diff against target: 22 lines (+12/-0)
1 file modified
qml/Stage/WindowResizeArea.qml (+12/-0)
To merge this branch: bzr merge lp:~aacid/unity8/cursorUpdateOnWindowClose
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve
Lukáš Tinkl (community) Approve
Review via email: mp+317825@code.launchpad.net

Commit message

Make sure cursor is back to normal when closing the window

This is not optimal since cursor may now be on top of a different resize area and should change to that, unfortunately QtQuick doesn't recalculate what mouseArea is hovered when another is destroyed :/

But better moving to the default cursor than being stuck with a weird resize cursor.

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
Lukáš Tinkl (lukas-kde) wrote :

Yeah, unfortunately I can't think of any better fix, so this will do as a workaround, thx!

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

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

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

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

PASSED: Continuous integration, rev:2810
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3241/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4250
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2522
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2522
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4278
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4114
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4114/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4114
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4114/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4114
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4114/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4114
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4114/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4114
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4114/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4114
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4114/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3241/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/WindowResizeArea.qml'
2--- qml/Stage/WindowResizeArea.qml 2017-01-26 11:10:01 +0000
3+++ qml/Stage/WindowResizeArea.qml 2017-02-21 15:20:29 +0000
4@@ -152,6 +152,18 @@
5 onCursorNameChanged: {
6 Mir.cursorName = cursorName;
7 }
8+ Component.onDestruction: {
9+ // TODO Qt 5.8 has fixed the problem with containsMouse
10+ // not being updated when the MouseArea that had containsMouse
11+ // is hidden/removed. When we start using Qt 5.8 we should
12+ // try to fix this scenario
13+ // two windows side by side
14+ // cursor in the resize left area of the right one
15+ // close window by Alt+F4
16+ // cursor should change to resize right of the left one
17+ // currently changes to ""
18+ Mir.cursorName = "";
19+ }
20
21 function updateBorders() {
22 leftBorder = mouseX <= borderThickness;

Subscribers

People subscribed via source and target branches