Merge lp:~lukas-kde/unity8/panelWindowControlButtonsFittsLaw into lp:unity8

[Lukáš Tinkl]

Respect Fitt's law wrt the window control buttons in panel

Respect Fitt's law wrt the window control buttons in panel

Fixes bug lp:1611959 - Topbar - window controls for maximised windows in the top bar should conform to Fitts's law

Move the inner margins from panel to the buttons, for example to be able to click in the left panel corners and get the window closed correctly.

Test added to tst_Panel

Also fix a minor bug with window title opacity animation.

Checklist:
* 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, visual design unchanged

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2600
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2012/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2637
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1442
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1442
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1442
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2665
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2539
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2539
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2539
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2533
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2533/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2533
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2533/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2533
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2533/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2533
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2533/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2533
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2533/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2533
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2533/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2533
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2533/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2533
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2533/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2533
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2533/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

 * 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, excepted unrelated unstable tests

review: Approve

[lp:~lukas-kde/unity8/panelWindowControlButtonsFittsLaw]

2601. By Lukáš Tinkl on 2016-09-01

merge trunk

=== modified file 'qml/Components/WindowControlButtons.qml'
--- qml/Components/WindowControlButtons.qml	2016-06-20 10:31:44 +0000
+++ qml/Components/WindowControlButtons.qml	2016-09-01 18:06:02 +0000
@@ -19,13 +19,12 @@
 
 Row {
     id: root
-    spacing: overlayShown ? units.gu(2) : units.gu(1)
+    spacing: overlayShown ? units.gu(2) : windowIsMaximized ? 0 : units.gu(1)
     Behavior on spacing {
         UbuntuNumberAnimation {}
     }
 
     // to be set from outside
-    property Item target
     property bool active: false
     property bool windowIsMaximized: false
     property bool closeButtonShown: true
@@ -49,13 +48,14 @@
 
         Rectangle {
             anchors.fill: parent
+            anchors.margins: windowIsMaximized ? units.dp(3) : 0
             radius: height / 2
             color: theme.palette.normal.negative
             visible: parent.containsMouse && !overlayShown
         }
         Icon {
             anchors.fill: parent
-            anchors.margins: units.dp(3)
+            anchors.margins: windowIsMaximized ? units.dp(6) : units.dp(3)
             source: "graphics/window-close.svg"
             color: root.active ? "white" : UbuntuColors.slate
         }
@@ -71,13 +71,14 @@
 
         Rectangle {
             anchors.fill: parent
+            anchors.margins: windowIsMaximized ? units.dp(3) : 0
             radius: height / 2
             color: root.active ? UbuntuColors.graphite : UbuntuColors.ash
             visible: parent.containsMouse && !overlayShown
         }
         Icon {
             anchors.fill: parent
-            anchors.margins: units.dp(3)
+            anchors.margins: windowIsMaximized ? units.dp(6) : units.dp(3)
             source: "graphics/window-minimize.svg"
             color: root.active ? "white" : UbuntuColors.slate
         }
@@ -103,13 +104,14 @@
 
         Rectangle {
             anchors.fill: parent
+            anchors.margins: windowIsMaximized ? units.dp(3) : 0
             radius: height / 2
             color: root.active ? UbuntuColors.graphite : UbuntuColors.ash
             visible: parent.containsMouse && !overlayShown
         }
         Icon {
             anchors.fill: parent
-            anchors.margins: units.dp(3)
+            anchors.margins: windowIsMaximized ? units.dp(6) : units.dp(3)
             source: root.windowIsMaximized ? "graphics/window-window.svg" : "graphics/window-maximize.svg"
             color: root.active ? "white" : UbuntuColors.slate
         }

=== modified file 'qml/Panel/Panel.qml'
--- qml/Panel/Panel.qml	2016-06-20 10:31:44 +0000
+++ qml/Panel/Panel.qml	2016-09-01 18:06:02 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Canonical, Ltd.
+ * Copyright (C) 2013-2016 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -120,11 +120,8 @@
                 anchors {
                     left: parent.left
                     top: parent.top
-                    leftMargin: units.gu(1)
-                    topMargin: units.gu(0.5)
-                    bottomMargin: units.gu(0.5)
                 }
-                height: indicators.minimizedPanelHeight - anchors.topMargin - anchors.bottomMargin
+                height: indicators.minimizedPanelHeight
 
                 visible: ((PanelState.buttonsVisible && parent.containsMouse) || PanelState.buttonsAlwaysVisible)
                          && !root.locked && !callHint.visible
@@ -183,13 +180,15 @@
             }
             color: "white"
             height: indicators.minimizedPanelHeight - anchors.topMargin - anchors.bottomMargin
-            visible: !windowControlButtons.visible && !root.locked && !callHint.visible
+            opacity: !windowControlButtons.visible && !root.locked && !callHint.visible ? 1 : 0
+            visible: opacity != 0
             verticalAlignment: Text.AlignVCenter
             fontSize: "medium"
             font.weight: PanelState.buttonsVisible ? Font.Light : Font.Medium
             text: PanelState.title
             elide: Text.ElideRight
             maximumLineCount: 1
+            Behavior on opacity { UbuntuNumberAnimation {} }
         }
 
         // TODO here would the Locally integrated menus come

=== modified file 'qml/Stages/WindowDecoration.qml'
--- qml/Stages/WindowDecoration.qml	2016-06-27 18:44:07 +0000
+++ qml/Stages/WindowDecoration.qml	2016-09-01 18:06:02 +0000
@@ -108,7 +108,6 @@
             onMaximizeHorizontallyClicked: root.maximizeHorizontallyClicked();
             onMaximizeVerticallyClicked: root.maximizeVerticallyClicked();
             closeButtonShown: root.target.application.appId !== "unity8-dash"
-            target: root.target
         }
 
         Label {
@@ -122,10 +121,8 @@
             font.weight: root.active ? Font.Light : Font.Medium
             elide: Text.ElideRight
             opacity: overlayShown ? 0 : 1
-            visible: opacity == 1
-            Behavior on opacity {
-                OpacityAnimator { duration: UbuntuAnimation.FastDuration; easing: UbuntuAnimation.StandardEasing }
-            }
+            visible: opacity != 0
+            Behavior on opacity { UbuntuNumberAnimation {} }
         }
     }
 }

=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
--- tests/qmltests/Panel/tst_Panel.qml	2016-04-05 20:21:43 +0000
+++ tests/qmltests/Panel/tst_Panel.qml	2016-09-01 18:06:02 +0000
@@ -182,6 +182,12 @@
             signalName: "pressedChanged"
         }
 
+        SignalSpy {
+            id: windowControlButtonsSpy
+            target: PanelState
+            signalName: "closeClicked"
+        }
+
         function init() {
             panel.fullscreenMode = false;
             callManager.foregroundCall = null;
@@ -197,6 +203,8 @@
 
             backgroundPressedSpy.clear();
             compare(backgroundPressedSpy.valid, true);
+            windowControlButtonsSpy.clear();
+            compare(windowControlButtonsSpy.valid, true);
         }
 
         function get_indicator_item(index) {
@@ -494,5 +502,16 @@
             compare(panel.indicators.shown, false);
             tryCompare(panel.indicators, "fullyClosed", true);
         }
+
+        // https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1611959
+        function test_windowControlButtonsFittsLaw() {
+            var buttonsVisible = PanelState.buttonsVisible;
+            PanelState.buttonsVisible = true;
+            // click in very topleft corner and verify the close button got clicked too
+            mouseMove(panel, 0, 0);
+            mouseClick(panel, 0, 0, undefined /*button*/, undefined /*modifiers*/, 100 /*short delay*/);
+            compare(windowControlButtonsSpy.count, 1);
+            PanelState.buttonsVisible = buttonsVisible;
+        }
     }
 }