Merge lp:~mzanetti/unity8/no-more-pinning-rtm into lp:unity8/rtm-14.09

[Michael Zanetti]

drop all visual indication of "pinning"

 * 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

 * Did you make sure that your branch does not contain spurious tags?

yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 * If you changed the UI, has there been a design review?

both N/A

[Andrea Cimitan (cimi)]

 * 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.
Waiting before top approve
 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

[Michał Sawicz (saviq)]

As per the upstream change.

review: Approve

=== modified file 'qml/Launcher/LauncherDelegate.qml'
--- qml/Launcher/LauncherDelegate.qml	2014-10-07 11:11:09 +0000
+++ qml/Launcher/LauncherDelegate.qml	2014-10-14 13:11:21 +0000
@@ -27,7 +27,6 @@
     property bool itemFocused: false
     property real maxAngle: 0
     property bool inverted: false
-    property alias pinned: pin.visible
 
     readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * itemHeight
     readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * itemHeight
@@ -71,31 +70,15 @@
             height: root.itemHeight - units.gu(1)
         }
 
-        Rectangle {
-            id: pin
-            anchors {
-                left: iconShape.left
-                top: iconShape.top
-                topMargin: -units.dp(2)
-            }
-            width: units.gu(1)
-            height: width
-            radius: width / 2
-            color: "white"
-        }
-
         UbuntuShape {
             id: countEmblem
             objectName: "countEmblem"
-
-            readonly property real pinMargin: pin.visible ? pin.width + units.gu(1) - anchors.leftMargin : 0
-
             anchors {
                 right: parent.right
                 top: parent.top
                 margins: units.dp(3)
             }
-            width: Math.min(root.itemWidth - pinMargin, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
+            width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
             height: units.gu(2)
             color: UbuntuColors.orange
             visible: root.countVisible
@@ -109,7 +92,7 @@
                 // FIXME: verticalCenter seems to be off wee bit and QML doesn't have a centerLine
                 // property for Text: https://bugreports.qt-project.org/browse/QTBUG-40479
                 anchors.verticalCenterOffset: -units.dp(.5)
-                width: root.itemWidth - units.gu(1) - countEmblem.pinMargin
+                width: root.itemWidth - units.gu(1)
                 horizontalAlignment: Text.AlignHCenter
                 elide: Text.ElideRight
                 color: "white"
 
=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2014-10-07 08:25:59 +0000
+++ qml/Launcher/LauncherPanel.qml	2014-10-14 13:11:21 +0000
@@ -149,7 +149,6 @@
                         count: model.count
                         countVisible: model.countVisible
                         progress: model.progress
-                        pinned: model.pinned
                         itemFocused: model.focused
                         inverted: root.inverted
                         z: -Math.abs(offset)
@@ -460,10 +459,6 @@
                 width: itemWidth
                 rotation: root.rotation
                 itemOpacity: 0.9
-                pinned: dndArea.draggedIndex > -1 &&
-                        LauncherModel.get(dndArea.draggedIndex).pinned &&
-                        !dndArea.preDragging &&
-                        !dndArea.dragging
 
                 function flatten() {
                     fakeDragItemAnimation.start();