on xenial help sign in
Remove dismiss timer in Launcher Fixes: #1368778

Approved by: Michael Zanetti, PS Jenkins bot

commitd6a86d29ae20442c4e2cb9a264bd3288d8a34dd0 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateThu 11 Dec 2014, 13:24 (12 years ago) parent2ad66ae0b2d718
2 files changed+7−9
qml/Launcher/Launcher.qml+7−4 tests/qmltests/Launcher/tst_Launcher.qml−5
qml/Launcher/Launcher.qml+7−4
@@ -23,6 +23,7 @@ import Unity.Launcher 0.1
2323Item {
2424 id: root
2525
26+ property bool autohideEnabled: false
2627 property bool available: true // can be used to disable all interactions
2728 property alias inverted: panel.inverted
2829
@@ -89,10 +90,12 @@ Item {
8990 objectName: "dismissTimer"
9091 interval: 5000
9192 onTriggered: {
92− if (!panel.preventHiding) {
93− root.state = ""
94− } else {
95− dismissTimer.restart()
93+ if (root.autohideEnabled) {
94+ if (!panel.preventHiding) {
95+ root.state = ""
96+ } else {
97+ dismissTimer.restart()
98+ }
9699 }
97100 }
98101 }
tests/qmltests/Launcher/tst_Launcher.qml−5
@@ -118,11 +118,6 @@ Item {
118118
119119 // Now do check that snapping is in fact enabled
120120 compare(listView.snapMode, ListView.SnapToItem, "Snapping is not enabled");
121−
122− // Tests can be run in a reaaaaally slow environment or machine. Thus ensure
123− // the dismissTimer doesn't time out inadvertently.
124− var dismissTimer = findInvisibleChild(launcher, "dismissTimer");
125− dismissTimer.interval = 60 * 60 * 1000; // one hour
126121 }
127122
128123 function dragLauncherIntoView() {