on xenial help sign in
comment code
commit4bef5eb2c9f85faf1e1ced60a71ccafa536aee72 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateWed 26 Nov 2014, 16:26 (12 years ago) parent07e4d0d
2 files changed+28−28
qml/Launcher/Launcher.qml+24−24 tests/qmltests/Launcher/tst_Launcher.qml+4−4
qml/Launcher/Launcher.qml+24−24
@@ -42,13 +42,13 @@ Item {
4242 // emitted when the dash icon in the launcher has been tapped
4343 signal showDashHome()
4444
45− onStateChanged: {
46− if (state == "") {
47− dismissTimer.stop()
48− } else {
49− dismissTimer.restart()
50− }
51− }
45+// onStateChanged: {
46+// if (state == "") {
47+// dismissTimer.stop()
48+// } else {
49+// dismissTimer.restart()
50+// }
51+// }
5252
5353 function hide() {
5454 switchToNextState("")
@@ -83,18 +83,18 @@ Item {
8383 property string mode: "teasing"
8484 }
8585
86− Timer {
87− id: dismissTimer
88− objectName: "dismissTimer"
89− interval: 5000
90− onTriggered: {
91− if (!panel.preventHiding) {
92− root.state = ""
93− } else {
94− dismissTimer.restart()
95− }
96− }
97− }
86+// Timer {
87+// id: dismissTimer
88+// objectName: "dismissTimer"
89+// interval: 5000
90+// onTriggered: {
91+// if (!panel.preventHiding) {
92+// root.state = ""
93+// } else {
94+// dismissTimer.restart()
95+// }
96+// }
97+// }
9898
9999 // Because the animation on x is disabled while dragging
100100 // switching state directly in the drag handlers would not animate
@@ -210,11 +210,11 @@ Item {
210210 root.showDashHome();
211211 }
212212
213− onPreventHidingChanged: {
214− if (dismissTimer.running) {
215− dismissTimer.restart();
216− }
217− }
213+// onPreventHidingChanged: {
214+// if (dismissTimer.running) {
215+// dismissTimer.restart();
216+// }
217+// }
218218
219219 Behavior on x {
220220 enabled: !dragArea.dragging && !launcherDragArea.drag.active && panel.animate;
tests/qmltests/Launcher/tst_Launcher.qml+4−4
@@ -119,10 +119,10 @@ Item {
119119 // Now do check that snapping is in fact enabled
120120 compare(listView.snapMode, ListView.SnapToItem, "Snapping is not enabled");
121121
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
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
126126 }
127127
128128 function dragLauncherIntoView() {