git.iko.soy/unity8
on xenial help sign in
cleanup a warning
785cf4aMichael Zanetti
qml/Launcher/LauncherDelegate.qml+2−1
compare with xenial
unifiedsplit
@@ -20,6 +20,7 @@ import Ubuntu.Components 1.3
20Item {
20Item {
21 id: root
21 id: root
22
22
23+ property int itemIndex: 0
23 property string iconName
24 property string iconName
24 property int count: 0
25 property int count: 0
25 property bool countVisible: false
26 property bool countVisible: false
@@ -264,7 +265,7 @@ Item {
264 visible: root.shortcutHintShown
265 visible: root.shortcutHintShown
265 Label {
266 Label {
266 anchors.centerIn: parent
267 anchors.centerIn: parent
267− text: index + 1
268+ text: itemIndex + 1
268 color: "white"
269 color: "white"
269 }
270 }
270 }
271 }
qml/Launcher/LauncherPanel.qml+1
@@ -218,6 +218,7 @@ Rectangle {
218 // the right app when running autopilot tests for
218 // the right app when running autopilot tests for
219 // multiple apps.
219 // multiple apps.
220 readonly property string appId: model.appId
220 readonly property string appId: model.appId
221+ itemIndex: index
221 itemHeight: launcherListView.itemHeight
222 itemHeight: launcherListView.itemHeight
222 itemWidth: launcherListView.itemWidth
223 itemWidth: launcherListView.itemWidth
223 width: itemWidth
224 width: itemWidth
tests/qmltests/Launcher/tst_Launcher.qml+4
@@ -927,6 +927,10 @@ Item {
927 launcher.superPressed = true;
927 launcher.superPressed = true;
928 tryCompare(launcher, "state", "visible");
928 tryCompare(launcher, "state", "visible");
929 tryCompare(shortCutHint0, "visible", true);
929 tryCompare(shortCutHint0, "visible", true);
930+
931+ launcher.superPressed = false;
932+ tryCompare(launcher, "state", "");
933+ tryCompare(shortCutHint0, "visible", false);
930 }
934 }
931 }
935 }
932}
936}