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

[Albert Astals Cid]

Make double click on the window decoration still maximize

And fix test and add a new one

WiP but i want to see the full CI test run

[lp:~aacid/unity8/doubleClickMaximize]

2771. By Albert Astals Cid on 2017-01-23

Dfiferent way of making double click work on window decoration

2772. By Albert Astals Cid on 2017-01-23

comment++

2773. By Albert Astals Cid on 2017-01-23

i'm tyopeing moar than usual

2774. By Albert Astals Cid on 2017-01-31

Merge ~nick-dedekind/unity8/menu.overflow

Unmerged revisions

=== modified file 'qml/ApplicationMenus/MenuBar.qml'
--- qml/ApplicationMenus/MenuBar.qml	2017-01-09 15:26:05 +0000
+++ qml/ApplicationMenus/MenuBar.qml	2017-01-19 16:09:12 +0000
@@ -188,6 +188,8 @@
             anchors.fill: parent
             hoverEnabled: d.currentItem
 
+            propagateComposedEvents: true
+
             onEntered: {
                 if (d.currentItem) {
                     updateCurrentItemFromPosition(Qt.point(mouseX, mouseY))
 
=== modified file 'qml/Stage/DecoratedWindow.qml'
--- qml/Stage/DecoratedWindow.qml	2016-12-12 11:16:47 +0000
+++ qml/Stage/DecoratedWindow.qml	2017-01-19 16:09:12 +0000
@@ -196,18 +196,19 @@
         ]
     }
 
-    MouseArea {
+    WindowDecoration {
+        id: decoration
+        closeButtonVisible: root.application.appId !== "unity8-dash"
+        objectName: "appWindowDecoration"
+
         anchors { left: parent.left; top: parent.top; right: parent.right }
         height: units.gu(3)
 
+        title: applicationWindow.title
+
         opacity: root.hasDecoration ? Math.min(1, root.showDecoration) : 0
-
         Behavior on opacity { UbuntuNumberAnimation { } }
 
-        drag.target: Item {}
-        drag.filterChildren: true
-        drag.threshold: 0
-
         onPressed: root.decorationPressed();
         onPressedChanged: moveHandler.handlePressedChanged(pressed, pressedButtons, mouseX, mouseY)
         onPositionChanged: moveHandler.handlePositionChanged(mouse)
@@ -216,47 +217,39 @@
             moveHandler.handleReleased();
         }
 
-        WindowDecoration {
-            id: decoration
-            closeButtonVisible: root.application.appId !== "unity8-dash"
-            objectName: "appWindowDecoration"
-            anchors.fill: parent
-            title: applicationWindow.title
-
-            onCloseClicked: root.closeClicked();
-            onMaximizeClicked: { root.decorationPressed(); root.maximizeClicked(); }
-            onMaximizeHorizontallyClicked: { root.decorationPressed(); root.maximizeHorizontallyClicked(); }
-            onMaximizeVerticallyClicked: { root.decorationPressed(); root.maximizeVerticallyClicked(); }
-            onMinimizeClicked: root.minimizeClicked();
-
-            enableMenus: {
-                return active &&
-                         surface &&
-                          (PanelState.focusedPersistentSurfaceId === surface.persistentId && !PanelState.decorationsVisible)
-            }
-            menu: sharedAppModel.model
-
-            Indicators.SharedUnityMenuModel {
-                id: sharedAppModel
-                property var menus: surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : []
-                property var menuService: menus.length > 0 ? menus[0] : undefined
-
-                busName: menuService ? menuService.service : ""
-                menuObjectPath: menuService && menuService.menuPath ? menuService.menuPath : ""
-                actions: menuService && menuService.actionPath ? { "unity": menuService.actionPath } : {}
-            }
-
-            Connections {
-                target: ApplicationMenuRegistry
-                onSurfaceMenuRegistered: {
-                    if (surface && surfaceId === surface.persistentId) {
-                        sharedAppModel.menus = Qt.binding(function() { return surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : [] });
-                    }
+        onCloseClicked: root.closeClicked();
+        onMaximizeClicked: { root.decorationPressed(); root.maximizeClicked(); }
+        onMaximizeHorizontallyClicked: { root.decorationPressed(); root.maximizeHorizontallyClicked(); }
+        onMaximizeVerticallyClicked: { root.decorationPressed(); root.maximizeVerticallyClicked(); }
+        onMinimizeClicked: root.minimizeClicked();
+
+        enableMenus: {
+            return active &&
+                     surface &&
+                      (PanelState.focusedPersistentSurfaceId === surface.persistentId && !PanelState.decorationsVisible)
+        }
+        menu: sharedAppModel.model
+
+        Indicators.SharedUnityMenuModel {
+            id: sharedAppModel
+            property var menus: surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : []
+            property var menuService: menus.length > 0 ? menus[0] : undefined
+
+            busName: menuService ? menuService.service : ""
+            menuObjectPath: menuService && menuService.menuPath ? menuService.menuPath : ""
+            actions: menuService && menuService.actionPath ? { "unity": menuService.actionPath } : {}
+        }
+
+        Connections {
+            target: ApplicationMenuRegistry
+            onSurfaceMenuRegistered: {
+                if (surface && surfaceId === surface.persistentId) {
+                    sharedAppModel.menus = Qt.binding(function() { return surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : [] });
                 }
-                onSurfaceMenuUnregistered: {
-                    if (surface && surfaceId === surface.persistentId) {
-                        sharedAppModel.menus = Qt.binding(function() { return surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : [] });
-                    }
+            }
+            onSurfaceMenuUnregistered: {
+                if (surface && surfaceId === surface.persistentId) {
+                    sharedAppModel.menus = Qt.binding(function() { return surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : [] });
                 }
             }
         }
 
=== modified file 'qml/Stage/WindowDecoration.qml'
--- qml/Stage/WindowDecoration.qml	2016-12-12 11:16:47 +0000
+++ qml/Stage/WindowDecoration.qml	2017-01-19 16:09:12 +0000
@@ -38,6 +38,10 @@
     acceptedButtons: Qt.AllButtons // prevent leaking unhandled mouse events
     hoverEnabled: true
 
+    drag.target: Item {}
+    drag.filterChildren: true
+    drag.threshold: 0
+
     signal closeClicked()
     signal minimizeClicked()
     signal maximizeClicked()
@@ -64,8 +68,8 @@
                                        (menuBar.showRequested || root.containsMouse)
     }
 
-    // We dont want touch events to fall through to parent,
-    // otherwise the containsMouse will not work.
+    // We dont want touch events to fall through to parent as it expect some child MouseArea to have them
+    // If not some MouseArea in the menu bar, it will be this one.
     MouseArea {
         anchors.fill: parent
         propagateComposedEvents: true
 
=== modified file 'tests/qmltests/Stage/tst_DesktopStage.qml'
--- tests/qmltests/Stage/tst_DesktopStage.qml	2017-01-10 14:44:29 +0000
+++ tests/qmltests/Stage/tst_DesktopStage.qml	2017-01-19 16:09:12 +0000
@@ -695,10 +695,17 @@
             var sizeBefore = Qt.size(dialerDelegate.width, dialerDelegate.height);
             var deco = findChild(dialerDelegate, "appWindowDecoration");
             verify(deco);
-            tryCompare(deco, "maximizeButtonShown", false);
-            mouseDoubleClick(deco);
-            var sizeAfter = Qt.size(dialerDelegate.width, dialerDelegate.height);
-            tryCompareFunction(function(){ return sizeBefore; }, sizeAfter);
+            mouseMove(deco, deco.width - units.gu(1), deco.height/2);
+            var menuBarLoader = findChild(deco, "menuBarLoader");
+            tryCompare(menuBarLoader.item, "visible", true);
+            mouseDoubleClick(deco, deco.width - units.gu(1), deco.height/2);
+            expectFail("", "Double click should not maximize ina a size restricted window");
+            tryCompareFunction(function() {
+                    var sizeAfter = Qt.size(dialerDelegate.width, dialerDelegate.height);
+                    return sizeAfter.width > sizeBefore.width && sizeAfter.height > sizeBefore.height;
+                },
+                true
+            );
 
             // remove restrictions, the maximize button should again be visible
             dialerDelegate.surface.setMaximumWidth(0);
@@ -706,6 +713,28 @@
             tryCompare(dialerMaximizeButton, "visible", true);
         }
 
+        function test_doubleClickMaximizes() {
+            var dialerDelegate = startApplication("dialer-app");
+
+            var dialerMaximizeButton = findChild(dialerDelegate, "maximizeWindowButton");
+            tryCompare(dialerMaximizeButton, "visible", true);
+
+            // try double clicking the decoration, shoul maximize it
+            var sizeBefore = Qt.size(dialerDelegate.width, dialerDelegate.height);
+            var deco = findChild(dialerDelegate, "appWindowDecoration");
+            verify(deco);
+            mouseMove(deco, deco.width - units.gu(1), deco.height/2);
+            var menuBarLoader = findChild(deco, "menuBarLoader");
+            tryCompare(menuBarLoader.item, "visible", true);
+            mouseDoubleClick(deco, deco.width - units.gu(1), deco.height/2);
+            tryCompareFunction(function() {
+                    var sizeAfter = Qt.size(dialerDelegate.width, dialerDelegate.height);
+                    return sizeAfter.width > sizeBefore.width && sizeAfter.height > sizeBefore.height;
+                },
+                true
+            );
+        }
+
         function test_canMoveWindowWithLeftMouseButtonOnly_data() {
             return [
                 {tag: "left mouse button", button: Qt.LeftButton },