Merge lp:~azzar1/unity8/launcher-tooltips into lp:unity8

[Andrea Azzarone]

[lp:~azzar1/unity8/launcher-tooltips]

2607. By Andrea Azzarone on 2016-09-26

Use a s StateMachine to handle tooltip logic.

2608. By Andrea Azzarone on 2016-09-26

Update tests.

2609. By Andrea Azzarone on 2016-09-26

Merge with trunk.

2610. By Andrea Azzarone on 2016-09-26

Add comment.

2611. By Andrea Azzarone on 2016-09-29

Merge with lp:~azzar1/unity8/remove-UbuntuShapeForItem

2612. By Andrea Azzarone on 2016-09-29

Refactor and simplify tooltip layout logic.

2613. By Andrea Azzarone on 2016-09-29

Merge with trunk.

2614. By Andrea Azzarone on 2016-09-29

Use conditional bindings.

2615. By Andrea Azzarone on 2016-10-05

Rebase on unified-stages branch.

2616. By Andrea Azzarone on 2016-10-05

Remove trailing space.

2617. By Andrea Azzarone on 2016-10-06

Resync with lp:~azzar1/unity8/remove-UbuntuShapeForItem

2618. By Andrea Azzarone on 2016-10-17

Remove mouseEventEater as we have hoverEnabled equals to true in dndArea.

2619. By Andrea Azzarone on 2016-10-18

Move Tooltip in a different component.

2620. By Andrea Azzarone on 2016-10-18

Remove useless code in Tooltip.qml

2621. By Andrea Azzarone on 2016-10-18

Add a delay in mouseMove.

2622. By Andrea Azzarone on 2016-10-18

Refactor the way we deal with tooltip delay timer.

2623. By Andrea Azzarone on 2016-10-19

Use revealByPush.

2624. By Andrea Azzarone on 2016-10-19

waitForRendering(launcher) when using revealyByEdgePush

2625. By Andrea Azzarone on 2016-10-19

Add deps to qml-module-qtqml-statemachine.

2626. By Andrea Azzarone on 2016-10-19

Revert change to revealByEdgePush

2627. By Andrea Azzarone on 2016-10-19

Disable the tests.

2628. By Andrea Azzarone on 2016-10-20

Disable enableHovered to debug test failures.

2629. By Andrea Azzarone on 2016-10-20

Re-enable tooltips and tests.

2630. By Andrea Azzarone on 2016-10-20

Resync with lp:~azzar1/unity8/remove-UbuntuShapeForItem

2631. By Andrea Azzarone on 2016-10-25

Mark hoveredItem and itemCenter as readonly

2632. By Andrea Azzarone on 2016-10-25

Avoid type conversion.

2633. By Andrea Azzarone on 2016-11-24

Merge with trunk.

2634. By Andrea Azzarone on 2016-11-24

Fix broken test.

Unmerged revisions

=== removed file 'qml/Components/UbuntuShapeForItem.qml'
--- qml/Components/UbuntuShapeForItem.qml	2016-03-23 20:05:10 +0000
+++ qml/Components/UbuntuShapeForItem.qml	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2012 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
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import Ubuntu.Components 1.3
-
-/* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more
- * general (Item-based) components. This ability should be incorporated into the SDK's
- * UbuntuShape so this file can be removed.
- * Bug: https://bugs.launchpad.net/tavastia/+bug/1089595
- */
-
-Item {
-    id: root
-
-    property alias radius: shape.radius
-    property alias image: source.sourceItem
-    property alias aspect: shape.aspect
-
-    ShaderEffectSource {
-        id: source
-        anchors.centerIn: parent // Placed under shape, so it's hidden
-        width: 1
-        height: 1
-        hideSource: true
-    }
-
-    Shape {
-        id: shape
-        image: source
-
-        anchors.fill: parent
-    }
-}

=== modified file 'qml/Launcher/LauncherDelegate.qml'
--- qml/Launcher/LauncherDelegate.qml	2016-06-03 11:13:46 +0000
+++ qml/Launcher/LauncherDelegate.qml	2016-09-26 13:07:23 +0000
@@ -22,6 +22,7 @@
 
     property int itemIndex: 0
     property string iconName
+    property string name
     property int count: 0
     property bool countVisible: false
     property int progress: -1

=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2016-07-27 14:51:26 +0000
+++ qml/Launcher/LauncherPanel.qml	2016-09-26 13:07:23 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.4
+import QtQml.StateMachine 1.0 as DSM
 import Ubuntu.Components 1.3
 import Unity.Launcher 0.1
 import Ubuntu.Components.Popups 1.3
@@ -41,7 +42,7 @@
     signal kbdNavigationCancelled()
 
     onXChanged: {
-        if (quickList.state == "open") {
+        if (quickList.state === "open") {
             quickList.state = ""
         }
     }
@@ -226,6 +227,7 @@
                         // the right app when running autopilot tests for
                         // multiple apps.
                         readonly property string appId: model.appId
+                        name: model.name
                         itemIndex: index
                         itemHeight: launcherListView.itemHeight
                         itemWidth: launcherListView.itemWidth
@@ -399,6 +401,7 @@
                         id: dndArea
                         objectName: "dndArea"
                         acceptedButtons: Qt.LeftButton | Qt.RightButton
+                        hoverEnabled: true
                         anchors {
                             fill: parent
                             topMargin: launcherListView.topMargin
@@ -632,7 +635,7 @@
         }
     }
 
-    UbuntuShapeForItem {
+    UbuntuShape {
         id: quickListShape
         objectName: "quickListShape"
         anchors.fill: quickList
@@ -645,7 +648,10 @@
             UbuntuNumberAnimation {}
         }
 
-        image: quickList
+        source: ShaderEffectSource {
+            sourceItem: quickList
+            hideSource: true
+        }
 
         Image {
             anchors {
@@ -825,4 +831,145 @@
             }
         }
     }
+
+    UbuntuShape {
+        id: tooltipShape
+        objectName: "tooltipShape"
+        anchors.fill: tooltip
+        opacity: tooltipShownState.active ? 0.95 : 0
+        visible: opacity > 0
+        rotation: root.rotation
+        aspect: UbuntuShape.Flat
+
+        Behavior on opacity {
+            UbuntuNumberAnimation {
+                duration: UbuntuAnimation.BriskDuration
+            }
+        }
+
+        source: ShaderEffectSource {
+            sourceItem: tooltip
+            hideSource: true
+        }
+
+        Image {
+            anchors {
+                right: parent.left
+                rightMargin: -units.dp(4)
+                verticalCenter: parent.verticalCenter
+                verticalCenterOffset: -tooltip.offset * (root.inverted ? -1 : 1)
+            }
+            height: units.gu(1)
+            width: units.gu(2)
+            source: "graphics/quicklist_tooltip.png"
+            rotation: 90
+        }
+    }
+
+    Rectangle {
+        id: tooltip
+        objectName: "tooltip"
+
+        color: theme.palette.normal.background
+        visible: tooltipShape.visible
+
+        width: tooltipLabel.contentWidth + units.gu(4)
+        height: tooltipLabel.contentHeight + units.gu(2)
+
+        y: itemCenter - (height / 2) + offset
+        rotation: root.rotation
+
+        anchors {
+            left: root.inverted ? undefined : parent.right
+            right: root.inverted ? parent.left : undefined
+            margins: units.gu(1)
+        }
+
+        property var hoveredItem: dndArea.containsMouse ? launcherListView.itemAt(dndArea.mouseX, dndArea.mouseY + launcherListView.realContentY) : null
+
+        property int itemCenter
+        property int offset: itemCenter + (height/2) + units.gu(1) > parent.height ? -itemCenter - (height/2) - units.gu(1) + parent.height :
+                             itemCenter - (height/2) < units.gu(1) ? (height/2) - itemCenter + units.gu(1) : 0
+
+        // This avoids artifacts on fade-out animation
+        onHoveredItemChanged : {
+            if (hoveredItem != null && !root.moving) {
+                itemCenter = root.mapFromItem(hoveredItem, 0, 0).y + (hoveredItem.height / 2) + hoveredItem.offset
+                tooltipLabel.text = tooltip.hoveredItem.name
+            }
+        }
+
+        Label {
+            id: tooltipLabel
+            height: parent.height
+            anchors.centerIn: parent
+            verticalAlignment: Label.AlignVCenter
+            color: theme.palette.normal.backgroundText
+        }
+
+        DSM.StateMachine {
+            id: tooltipStateMachine
+            initialState: tooltipHiddenState
+            running: true
+
+            DSM.State {
+                id: tooltipHiddenState
+
+                DSM.SignalTransition {
+                    targetState: tooltipShownState
+                    signal: tooltip.hoveredItemChanged
+                    // !dndArea.pressed allows us to filter out touch input events
+                    guard: tooltip.hoveredItem != null && !dndArea.pressed && !root.moving
+                }
+            }
+
+            DSM.State {
+                id: tooltipShownState
+
+                DSM.SignalTransition {
+                    targetState: tooltipHiddenState
+                    signal: tooltip.hoveredItemChanged
+                    guard: tooltip.hoveredItem == null
+                }
+
+                DSM.SignalTransition {
+                    targetState: tooltipHiddenState
+                    signal: dndArea.exited
+                } 
+
+                DSM.SignalTransition {
+                    targetState: tooltipDismissedState
+                    signal: dndArea.onPressed
+                }
+
+                DSM.SignalTransition {
+                    targetState: tooltipDismissedState
+                    signal: quickList.stateChanged
+                    guard: quickList.state === "open"
+                }
+
+                DSM.SignalTransition {
+                    targetState: tooltipDismissedState
+                    signal: root.movingChanged
+                    guard: root.moving
+                }
+            }
+
+            DSM.State {
+                id: tooltipDismissedState
+
+                DSM.SignalTransition {
+                    targetState: tooltipHiddenState
+                    signal: dndArea.positionChanged
+                    guard: quickList.state != "open" && !dndArea.pressed && !dndArea.moving
+                }
+
+                DSM.SignalTransition {
+                    targetState: tooltipHiddenState
+                    signal: dndArea.exited
+                    guard: quickList.state != "open"
+                }
+            }
+        }
+    }
 }

=== modified file 'qml/Stages/DesktopSpread.qml'
--- qml/Stages/DesktopSpread.qml	2016-06-15 14:08:18 +0000
+++ qml/Stages/DesktopSpread.qml	2016-09-26 13:07:23 +0000
@@ -311,10 +311,10 @@
                         anchors { left: parent.left; top: parent.top; right: parent.right }
                         spacing: units.gu(1)
 
-                        UbuntuShapeForItem {
+                        UbuntuShape {
                             Layout.preferredHeight: Math.min(units.gu(6), root.height * .05)
                             Layout.preferredWidth: height * 8 / 7.6
-                            image: Image {
+                            source: Image {
                                 anchors.fill: parent
                                 source: model.application.icon
                                 Rectangle {

=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2016-08-01 11:23:49 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2016-09-26 13:07:23 +0000
@@ -1353,5 +1353,91 @@
             mouseWheel(launcherPanel, launcherPanel.width/2, launcherPanel.height/2, Qt.RightButton);
             tryCompare(clickThroughSpy, "count", 0);
         }
+
+        function test_tooltip() {
+            launcher.lockedVisible = true;
+            dragLauncherIntoView();
+
+            var item = findChild(launcher, "launcherDelegate0");
+            var tooltipShape = findChild(launcher, "tooltipShape");
+
+            // Make sure we don't start the test with the mouse hovering the launcher
+            mouseMove(root, root.width, root.height / 2);
+
+            // Initial state
+            tryCompare(tooltipShape, "visible", false);
+
+            // Move the mouse on the launcher icon
+            mouseMove(item, item.width / 2, item.height / 2);
+            mouseMove(item, item.width / 2 + 1, item.height / 2);
+            tryCompare(tooltipShape, "visible", true);
+
+            // Move the mouse away
+            mouseMove(root, root.width, root.height / 2);
+            tryCompare(tooltipShape, "visible", false);
+        }
+
+        function test_quicklist_dismisses_tooltip() {
+            launcher.lockedVisible = true;
+            dragLauncherIntoView();
+
+            var item = findChild(launcher, "launcherDelegate0");
+            var tooltipShape = findChild(launcher, "tooltipShape");
+            var quickListShape = findChild(launcher, "quickListShape");
+
+            // Make sure we don't start the test with the mouse hovering the launcher
+            mouseMove(root, root.width, root.height / 2);
+
+            // Initial state
+            tryCompare(tooltipShape, "visible", false);
+
+            // Move the mouse on the launcher icon
+            mouseMove(item, item.width / 2, item.height / 2);
+            mouseMove(item, item.width / 2 + 1, item.height / 2);
+            tryCompare(tooltipShape, "visible", true);
+
+            // Right click to show the quicklist
+            mouseClick(item, item.width / 2, item.height / 2, Qt.RightButton);
+            tryCompare(quickListShape, "visible", true);
+            tryCompare(tooltipShape, "visible", false);
+
+            // Left click hides the quicklist, tooltip is still dismissed
+            mouseClick(item, item.width / 2, item.height / 2, Qt.LefftButton);
+            tryCompare(quickListShape, "visible", false);
+            tryCompare(tooltipShape, "visible", false);
+
+            // Mouse motion should should show tooltip again
+            mouseMove(item, item.width / 2, item.height / 2);
+            mouseMove(item, item.width / 2 + 1, item.height / 2);
+            tryCompare(tooltipShape, "visible", true);
+        }
+
+        function test_click_dismisses_tooltip() {
+            launcher.lockedVisible = true;
+            dragLauncherIntoView();
+
+            var item = findChild(launcher, "launcherDelegate0");
+            var tooltipShape = findChild(launcher, "tooltipShape");
+
+            // Make sure we don't start the test with the mouse hovering the launcher
+            mouseMove(root, root.width, root.height / 2);
+
+            // Initial state
+            compare(tooltipShape.visible, false);
+
+            // Move the mouse on the launcher icon
+            mouseMove(item, item.width / 2, item.height / 2);
+            mouseMove(item, item.width / 2 + 1, item.height / 2);
+            tryCompare(tooltipShape, "visible", true);
+
+            // Left click should dismiss the tooltip
+            mouseClick(item, item.width / 2 + 1, item.height / 2, Qt.LeftButton);
+            tryCompare(tooltipShape, "visible", false);
+
+            // Mouse motion should should show tooltip again
+            mouseMove(item, item.width / 2, item.height / 2);
+            mouseMove(item, item.width / 2 + 1, item.height / 2);
+            tryCompare(tooltipShape, "visible", true);
+        }
     }
 }