on xenial help sign in
update launcher highlight graphics as requested by design
commit45384567c3e8dbebb9a2e77596b476e75dbcf62c authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 24 Jun 2014, 12:32 (12 years ago) parente82a901
9 files changed+6−17
qml/Launcher/LauncherDelegate.qml+4−7 qml/Launcher/LauncherPanel.qml+2 qml/Launcher/graphics/highlight@18.png qml/Launcher/graphics/icon-top-highlight.png qml/Launcher/graphics/non-selected@18.png qml/Launcher/graphics/non-selected@18.sci−5 qml/Launcher/graphics/selected@18.png qml/Launcher/graphics/selected@18.sci−5 qml/Launcher/graphics/triangle@18.png
qml/Launcher/LauncherDelegate.qml+4−7
@@ -23,7 +23,6 @@ Item {
2323 property string iconName
2424 property int count: -1
2525 property int progress: -1
26− property bool highlighted: false
2726 property bool itemFocused: false
2827 property real maxAngle: 0
2928 property bool inverted: false
@@ -43,7 +42,6 @@ Item {
4342 onIconNameChanged: shaderEffectSource.scheduleUpdate();
4443 onCountChanged: shaderEffectSource.scheduleUpdate();
4544 onProgressChanged: shaderEffectSource.scheduleUpdate();
46− onHighlightedChanged: shaderEffectSource.scheduleUpdate();
4745 onItemFocusedChanged: shaderEffectSource.scheduleUpdate();
4846
4947 Item {
@@ -68,12 +66,11 @@ Item {
6866 }
6967
7068 BorderImage {
71− id: overlayHighlight
69+ id: itemGlow
7270 anchors.centerIn: iconItem
73− rotation: inverted ? 180 : 0
74− source: root.highlighted ? "graphics/selected.sci" : "graphics/non-selected.sci"
75− width: root.itemWidth + units.gu(0.5)
76− height: root.itemHeight + units.gu(0.5)
71+ source: "graphics/icon-top-highlight.png"
72+ width: root.itemWidth - units.gu(1)
73+ height: root.itemHeight - units.gu(1)
7774 }
7875
7976 BorderImage {
qml/Launcher/LauncherPanel.qml+2
@@ -523,6 +523,7 @@ Item {
523523 color: "#221e1c"
524524 width: units.gu(30)
525525 height: quickListColumn.height
526+ visible: quickListShape.visible
526527 anchors {
527528 left: root.inverted ? undefined : parent.right
528529 right: root.inverted ? parent.left : undefined
@@ -561,6 +562,7 @@ Item {
561562 __foregroundColor: Theme.palette.selected.backgroundText
562563
563564 onClicked: {
565+ print("clicked on quicklist!")
564566 if (!model.clickable) {
565567 return;
566568 }
qml/Launcher/graphics/highlight@18.pngdeleted

Binary file not shown.

qml/Launcher/graphics/icon-top-highlight.pngnew file

Binary file not shown.

qml/Launcher/graphics/non-selected@18.pngdeleted

Binary file not shown.

qml/Launcher/graphics/non-selected@18.scideleted−5
@@ -1,5 +0,0 @@
1−border.left: 54
2−border.top: 60
3−border.bottom: 60
4−border.right: 54
5−source: non-selected@18.png
qml/Launcher/graphics/selected@18.pngdeleted

Binary file not shown.

qml/Launcher/graphics/selected@18.scideleted−5
@@ -1,5 +0,0 @@
1−border.left: 54
2−border.top: 60
3−border.bottom: 60
4−border.right: 54
5−source: selected@18.png
qml/Launcher/graphics/triangle@18.pngdeleted

Binary file not shown.