Merge lp:~uriboni/unity-2d/launcher-shelf into lp:unity-2d/3.0

[Ugo Riboni]

[launcher] New "shelf" area at the bottom of the launcher, which is essentially a second list of items which stays fixed in place and is always as tall as all the items it contains. For now it only contain the trash.

[Ugo Riboni (uriboni)]

Please note that is one issue that I have not been able to solve.

In some cases (which i can't repro consistently) the menu for some items stop to appear on mouse over.
The items are always those close to the bottom of the normal list or the item in the shelf (i.e. trash).

The way I seem to get this issue the most often is when i very quickly move the mouse up and down over the seam between the launcher and shelf, making sure to go in and out of the bottom autoscroll area of the main list in both directions.
Then going over these items will consistently stop showing a menu.

The menu doesn't show because of the check for isVisible() in LauncherContextualMenu::show() finds that the menu isVisible() is true even though there's no menu actually visible on screen.

[Olivier Tilloy (osomon)]

This may also be of interest to the reviewer(s): I haven’t looked at the code, but from the description of the changes, this branch very likely breaks and/or conflicts with the changes this other merge request: https://code.launchpad.net/~osomon/unity-2d/dnd2/+merge/49782.

[Florian Boucault (fboucault)]

> This may also be of interest to the reviewer(s): I haven’t looked at the code,
> but from the description of the changes, this branch very likely breaks and/or
> conflicts with the changes this other merge request:
> https://code.launchpad.net/~osomon/unity-2d/dnd2/+merge/49782.

Indeed though the conflicts will be easy to solve I believe. Now the question is, who will be first in? :)

[Florian Boucault (fboucault)]

There is a conflict in Launcher.qml introduced by revision 391. I believe it's resolved by:
- keeping the code from the launcher-shelf branch
- adding the 3 lines of code introduced by revision 391:

            /* Drag’n’drop handling */
            function dragEnterEvent(event) { item.onDragEnter(event) }
            function dropEvent(event) { item.onDrop(event) }

review: Needs Fixing

[Florian Boucault (fboucault)]

Very clean job. Good to go.

Please approve the MR once the conflict is resolved.

review: Approve

[lp:~uriboni/unity-2d/launcher-shelf]

393. By Ugo Riboni on 2011-02-18

Merge changes from trunk

[Ugo Riboni (uriboni)]

Fixed conflicts. Self-approving as requested.

review: Approve

=== modified file 'launcher/AutoScrollingListView.qml'
--- launcher/AutoScrollingListView.qml	2011-02-15 18:33:55 +0000
+++ launcher/AutoScrollingListView.qml	2011-02-18 13:38:21 +0000
@@ -84,6 +84,7 @@
     Connections {
         target: scrollZoneTop
         onEntered: updateItemBelow(scrollZoneTop)
+        onExited: { if (itemBelow) itemBelow.exited(); itemBelow = null }
         onPositionChanged: updateItemBelow(scrollZoneTop)
         onClicked: forwardClick(scrollZoneTop, mouse)
     }
@@ -91,6 +92,7 @@
     Connections {
         target: scrollZoneBottom
         onEntered: updateItemBelow(scrollZoneBottom)
+        onExited: { if (itemBelow) itemBelow.exited(); itemBelow = null }
         onPositionChanged: updateItemBelow(scrollZoneBottom)
         onClicked: forwardClick(scrollZoneBottom, mouse)
     }
 
=== modified file 'launcher/Launcher.qml'
--- launcher/Launcher.qml	2011-02-16 16:12:23 +0000
+++ launcher/Launcher.qml	2011-02-18 13:38:21 +0000
@@ -13,129 +13,30 @@
         source: "artwork/background.png"
     }
 
-    AutoScrollingListView {
-        id: list
+    LauncherList {
+        id: main
+        anchors.top: parent.top
+        anchors.bottom: shelf.top
+        width: parent.width
 
-        spacing: 5
         paddingTop: 5
         paddingBottom: 5
-
-        anchors.fill: parent
-        focus: true
-        property int itemHeight: 54
-        autoScrollSize: itemHeight / 2
+        autoScrollSize: tileSize / 2
         autoScrollVelocity: 200
 
-        /* Keep a reference to the currently visible contextual menu */
-        property variant visibleMenu
-
         model: ListAggregatorModel {
             id: items
         }
-
-        delegate: LauncherItem {
-            id: launcherItem
-
-            width: launcher.width
-            height: tileSize
-
-            icon: "image://icons/" + item.icon
-            running: item.running
-            active: item.active
-            urgent: item.urgent
-            launching: item.launching
-            pips: Math.min(item.windowCount, 3)
-            tileSize: list.itemHeight
-
-            /* Best way I could find to check if the item is an application or the
-               workspaces switcher. There may be something cleaner and better. */
-            backgroundFromIcon: item.toString().indexOf("LauncherApplication") == 0 ||
-                                item.toString().indexOf("Workspaces") == 0
-
-            Binding { target: item.menu; property: "title"; value: item.name }
-
-            /* Drag’n’drop handling */
-            function dragEnterEvent(event) { item.onDragEnter(event) }
-            function dropEvent(event) { item.onDrop(event) }
-
-            function showMenu() {
-                /* Prevent the simultaneous display of multiple menus */
-                if (list.visibleMenu != item.menu && list.visibleMenu != undefined) {
-                    list.visibleMenu.hide()
-                }
-                list.visibleMenu = item.menu
-                // The extra 4 pixels are needed to center exactly with the arrow
-                // that indicated the active tile.
-                item.menu.show(width,
-                               y + height / 2 - list.contentY +
-                               panel.y - list.paddingTop + 4)
-            }
-
-            onClicked: {
-                if (mouse.button == Qt.LeftButton) {
-                    item.menu.hide()
-                    item.activate()
-                }
-                else if (mouse.button == Qt.RightButton) {
-                    item.menu.folded = false
-                    showMenu()
-                }
-            }
-
-            /* Display the tooltip when hovering the item only when the list
-               is not moving */
-            onEntered: if (!list.moving && !list.autoScrolling) showMenu()
-            onExited: {
-                /* When unfolded, leave enough time for the user to reach the
-                   menu. Necessary because there is some void between the item
-                   and the menu. Also it fixes the case when the user
-                   overshoots. */
-                if (!item.menu.folded)
-                    item.menu.hideWithDelay(400)
-                else
-                    item.menu.hide()
-            }
-
-            Connections {
-                target: list
-                onMovementStarted: item.menu.hide()
-                onAutoScrollingChanged: if (list.autoScrolling) item.menu.hide()
-            }
-
-            function setIconGeometry() {
-                if (running) {
-                    item.setIconGeometry(x + panel.x, y + panel.y, width, height)
-                }
-            }
-
-            ListView.onAdd: SequentialAnimation {
-                PropertyAction { target: launcherItem; property: "scale"; value: 0 }
-                NumberAnimation { target: launcherItem; property: "height";
-                                  from: 0; to: launcherItem.tileSize; duration: 250; easing.type: Easing.InOutQuad }
-                NumberAnimation { target: launcherItem; property: "scale"; to: 1; duration: 250; easing.type: Easing.InOutQuad }
-            }
-
-            ListView.onRemove: SequentialAnimation {
-                PropertyAction { target: launcherItem; property: "ListView.delayRemove"; value: true }
-                NumberAnimation { target: launcherItem; property: "scale"; to: 0; duration: 250; easing.type: Easing.InOutQuad }
-                NumberAnimation { target: launcherItem; property: "height"; to: 0; duration: 250; easing.type: Easing.InOutQuad }
-                PropertyAction { target: launcherItem; property: "ListView.delayRemove"; value: false }
-            }
-
-            onRunningChanged: setIconGeometry()
-            /* Note: this doesn’t work as expected for the first favorite
-               application in the list if it is already running when the
-               launcher is started, because its y property doesn’t change.
-               This isn’t too bad though, as the launcher is supposed to be
-               started before any other regular application. */
-            onYChanged: setIconGeometry()
-
-            Connections {
-                target: item
-                onWindowAdded: item.setIconGeometry(x + panel.x, y + panel.y, width, height, xid)
-                /* Not all items are applications. */
-                ignoreUnknownSignals: true
-            }
+    }
+
+    LauncherList {
+        id: shelf
+        anchors.bottom: parent.bottom;
+        height: tileSize * count + spacing * Math.max(0, count - 1)
+        width: parent.width
+
+        model: ListAggregatorModel {
+            id: shelfItems
         }
     }
 
@@ -151,20 +52,20 @@
         id: devices
     }
 
+    WorkspacesList {
+        id: workspaces
+    }
+
     Trashes {
         id: trashes
     }
 
-    WorkspacesList {
-        id: workspaces
-    }
-
     Component.onCompleted: {
         items.appendModel(applications);
         items.appendModel(workspaces);
         items.appendModel(places);
         items.appendModel(devices);
-        items.appendModel(trashes);
+        shelfItems.appendModel(trashes);
     }
 
     Connections {
 
=== modified file 'launcher/LauncherItem.qml'
--- launcher/LauncherItem.qml	2011-02-16 11:11:46 +0000
+++ launcher/LauncherItem.qml	2011-02-18 13:38:21 +0000
@@ -34,6 +34,7 @@
     objectName: "launcherItem"
 
     anchors.horizontalCenter: parent.horizontalCenter
+    height: tileSize
 
     property int tileSize
     property alias icon: icon.source
@@ -108,7 +109,7 @@
         id: tile
         anchors.centerIn: parent
         width: item.tileSize
-        height: parent.height
+        height: item.height
 
         /* This is the image providing the background image. The
            color blended with this image is obtained from the color of the icon when it's
 
=== added file 'launcher/LauncherList.qml'
--- launcher/LauncherList.qml	1970-01-01 00:00:00 +0000
+++ launcher/LauncherList.qml	2011-02-18 13:38:21 +0000
@@ -0,0 +1,117 @@
+import Qt 4.7
+import UnityApplications 1.0
+import Unity2d 1.0 /* required for drag’n’drop handling */
+
+AutoScrollingListView {
+    id: list
+    spacing: 5
+    property int tileSize: 54
+
+    /* Keep a reference to the currently visible contextual menu */
+    property variant visibleMenu
+
+    delegate: LauncherItem {
+        id: launcherItem
+
+        width: list.width
+        tileSize: list.tileSize
+
+        icon: "image://icons/" + item.icon
+        running: item.running
+        active: item.active
+        urgent: item.urgent
+        launching: item.launching
+        pips: Math.min(item.windowCount, 3)
+
+        /* Best way I could find to check if the item is an application or the
+           workspaces switcher. There may be something cleaner and better. */
+        backgroundFromIcon: item.toString().indexOf("LauncherApplication") == 0 ||
+                            item.toString().indexOf("Workspaces") == 0
+
+        Binding { target: item.menu; property: "title"; value: item.name }
+
+        /* Drag’n’drop handling */
+        function dragEnterEvent(event) { item.onDragEnter(event) }
+        function dropEvent(event) { item.onDrop(event) }
+
+        function showMenu() {
+            /* Prevent the simultaneous display of multiple menus */
+            if (list.visibleMenu != item.menu && list.visibleMenu != undefined) {
+                list.visibleMenu.hide()
+            }
+            list.visibleMenu = item.menu
+            // The extra 4 pixels are needed to center exactly with the arrow
+            // indicating the active tile.
+            item.menu.show(width, panel.y + list.y +
+                                  y + height / 2 - list.contentY
+                                  - list.paddingTop + 4)
+
+        }
+
+        onClicked: {
+            if (mouse.button == Qt.LeftButton) {
+                item.menu.hide()
+                item.activate()
+            }
+            else if (mouse.button == Qt.RightButton) {
+                item.menu.folded = false
+                showMenu()
+            }
+        }
+
+        /* Display the tooltip when hovering the item only when the list
+           is not moving */
+        onEntered: if (!list.moving && !list.autoScrolling) showMenu()
+        onExited: {
+            /* When unfolded, leave enough time for the user to reach the
+               menu. Necessary because there is some void between the item
+               and the menu. Also it fixes the case when the user
+               overshoots. */
+            if (!item.menu.folded)
+                item.menu.hideWithDelay(400)
+            else
+                item.menu.hide()
+        }
+
+        Connections {
+            target: list
+            onMovementStarted: item.menu.hide()
+            onAutoScrollingChanged: if (list.autoScrolling) item.menu.hide()
+        }
+
+        function setIconGeometry() {
+            if (running) {
+                item.setIconGeometry(x + panel.x, y + panel.y, width, height)
+            }
+        }
+
+        ListView.onAdd: SequentialAnimation {
+            PropertyAction { target: launcherItem; property: "scale"; value: 0 }
+            NumberAnimation { target: launcherItem; property: "height";
+                              from: 0; to: launcherItem.tileSize; duration: 250; easing.type: Easing.InOutQuad }
+            NumberAnimation { target: launcherItem; property: "scale"; to: 1; duration: 250; easing.type: Easing.InOutQuad }
+        }
+
+        ListView.onRemove: SequentialAnimation {
+            PropertyAction { target: launcherItem; property: "ListView.delayRemove"; value: true }
+            NumberAnimation { target: launcherItem; property: "scale"; to: 0; duration: 250; easing.type: Easing.InOutQuad }
+            NumberAnimation { target: launcherItem; property: "height"; to: 0; duration: 250; easing.type: Easing.InOutQuad }
+            PropertyAction { target: launcherItem; property: "ListView.delayRemove"; value: false }
+        }
+
+        onRunningChanged: setIconGeometry()
+        /* Note: this doesn’t work as expected for the first favorite
+           application in the list if it is already running when the
+           launcher is started, because its y property doesn’t change.
+           This isn’t too bad though, as the launcher is supposed to be
+           started before any other regular application. */
+        onYChanged: setIconGeometry()
+
+        Connections {
+            target: item
+            onWindowAdded: item.setIconGeometry(x + panel.x, y + panel.y, width, height, xid)
+            /* Not all items are applications. */
+            ignoreUnknownSignals: true
+        }
+    }
+}