git.iko.soy/unity8
on xenial help sign in
cleanup a warning
commit785cf4a03699a90515fb6a5cc431010c20d5d56c authorMichael Zanetti <michael.zanetti@canonical.com> dateWed 25 Nov 2015, 14:32 (11 years ago) parent0a41ae1
3 files changed+7−1
compare with xenial
unifiedsplit
qml/Launcher/LauncherDelegate.qml+2−1 qml/Launcher/LauncherPanel.qml+1 tests/qmltests/Launcher/tst_Launcher.qml+4
qml/Launcher/LauncherDelegate.qml+2−1
@@ -20,6 +20,7 @@ import Ubuntu.Components 1.3
2020Item {
2121 id: root
2222
23+ property int itemIndex: 0
2324 property string iconName
2425 property int count: 0
2526 property bool countVisible: false
@@ -264,7 +265,7 @@ Item {
264265 visible: root.shortcutHintShown
265266 Label {
266267 anchors.centerIn: parent
267− text: index + 1
268+ text: itemIndex + 1
268269 color: "white"
269270 }
270271 }
qml/Launcher/LauncherPanel.qml+1
@@ -218,6 +218,7 @@ Rectangle {
218218 // the right app when running autopilot tests for
219219 // multiple apps.
220220 readonly property string appId: model.appId
221+ itemIndex: index
221222 itemHeight: launcherListView.itemHeight
222223 itemWidth: launcherListView.itemWidth
223224 width: itemWidth
tests/qmltests/Launcher/tst_Launcher.qml+4
@@ -927,6 +927,10 @@ Item {
927927 launcher.superPressed = true;
928928 tryCompare(launcher, "state", "visible");
929929 tryCompare(shortCutHint0, "visible", true);
930+
931+ launcher.superPressed = false;
932+ tryCompare(launcher, "state", "");
933+ tryCompare(shortCutHint0, "visible", false);
930934 }
931935 }
932936}