on xenial help sign in
drop all visual indication of "pinned". Design doesn't want it any more.
commitaf3efa8d5476ba67194b8049c682107044e77f8b authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 14 Oct 2014, 14:28 (12 years ago) parent10ac5e3
2 files changed+2−24
qml/Launcher/LauncherDelegate.qml+2−19 qml/Launcher/LauncherPanel.qml−5
qml/Launcher/LauncherDelegate.qml+2−19
@@ -27,7 +27,6 @@ Item {
2727 property bool itemFocused: false
2828 property real maxAngle: 0
2929 property bool inverted: false
30− property alias pinned: pin.visible
3130
3231 readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * itemHeight
3332 readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * itemHeight
@@ -71,31 +70,15 @@ Item {
7170 height: root.itemHeight - units.gu(1)
7271 }
7372
74− Rectangle {
75− id: pin
76− anchors {
77− left: iconShape.left
78− top: iconShape.top
79− topMargin: -units.dp(2)
80− }
81− width: units.gu(1)
82− height: width
83− radius: width / 2
84− color: "white"
85− }
86−
8773 UbuntuShape {
8874 id: countEmblem
8975 objectName: "countEmblem"
90−
91− readonly property real pinMargin: pin.visible ? pin.width + units.gu(1) - anchors.leftMargin : 0
92−
9376 anchors {
9477 right: parent.right
9578 top: parent.top
9679 margins: units.dp(3)
9780 }
98− width: Math.min(root.itemWidth - pinMargin, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
81+ width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
9982 height: units.gu(2)
10083 color: UbuntuColors.orange
10184 visible: root.countVisible
@@ -109,7 +92,7 @@ Item {
10992 // FIXME: verticalCenter seems to be off wee bit and QML doesn't have a centerLine
11093 // property for Text: https://bugreports.qt-project.org/browse/QTBUG-40479
11194 anchors.verticalCenterOffset: -units.dp(.5)
112− width: root.itemWidth - units.gu(1) - countEmblem.pinMargin
95+ width: root.itemWidth - units.gu(1)
11396 horizontalAlignment: Text.AlignHCenter
11497 elide: Text.ElideRight
11598 color: "white"
qml/Launcher/LauncherPanel.qml−5
@@ -151,7 +151,6 @@ Rectangle {
151151 count: model.count
152152 countVisible: model.countVisible
153153 progress: model.progress
154− pinned: model.pinned
155154 itemFocused: model.focused
156155 inverted: root.inverted
157156 z: -Math.abs(offset)
@@ -462,10 +461,6 @@ Rectangle {
462461 width: itemWidth
463462 rotation: root.rotation
464463 itemOpacity: 0.9
465− pinned: dndArea.draggedIndex > -1 &&
466− LauncherModel.get(dndArea.draggedIndex).pinned &&
467− !dndArea.preDragging &&
468− !dndArea.dragging
469464
470465 function flatten() {
471466 fakeDragItemAnimation.start();