on xenial help sign in
reenable hiding of the panel, fix panel.moving condition
commitcb1a954d967e1086fb1f26ce6db6f8c55370089d authorMichael Zanetti <michael.zanetti@canonical.com> dateFri 16 Aug 2013, 00:41 (13 years ago) parent409bafb
2 files changed+2−3
Launcher/Launcher.qml+1−1 Launcher/LauncherPanel.qml+1−2
Launcher/Launcher.qml+1−1
@@ -74,7 +74,7 @@ Item {
7474 interval: 5000
7575 onTriggered: {
7676 if (!panel.moving) {
77−// root.state = ""
77+ root.state = ""
7878 } else {
7979 dismissTimer.restart()
8080 }
Launcher/LauncherPanel.qml+1−2
@@ -29,7 +29,7 @@ Item {
2929 property var model
3030 property bool inverted: true
3131 property bool dragging: false
32− property bool moving: launcherListView.moving || launcherListView.flicking || dndArea.draggedItem !== undefined
32+ property bool moving: launcherListView.moving || launcherListView.flicking || dndArea.draggedIndex >= 0
3333 property int highlightIndex: -1
3434
3535 signal applicationSelected(string desktopFile)
@@ -402,6 +402,5 @@ Item {
402402 itemOpacity: 0.8
403403 }
404404 }
405−
406405 }
407406}