← Back to branch summary

~mterry/unity8/greeter-misc-cleanups

« back to all changes in this revision

Viewing changes to qml/Launcher/Launcher.qml

  • Committer: Michael Terry
  • Date: 2014-08-07 15:30:54 UTC
  • mfrom: (1086.1.48 unity8)
  • Revision ID: michael.terry@canonical.com-20140807153054-nqahwmptl0dw9bum
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Launcher/Launcher.qml
29
29
    property int dragAreaWidth: units.gu(1)
30
30
    property int minimizeDistance: units.gu(26)
31
31
    property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?
32
 
                                (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) :
33
 
                                (dragArea.dragging ? 0.001 : 0)
 
32
                                (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) : 0
34
33
 
35
34
    readonly property bool shown: panel.x > -panel.width
36
35
 
245
244
            if (!dragging) {
246
245
                if (distance > panel.width / 2) {
247
246
                    if (distance > minimizeDistance) {
248
 
                        root.dash()
 
247
                        root.dash();
249
248
                    } else {
250
249
                        root.switchToNextState("visible")
251
250
                    }