Merge from dialer-above
commit49bee7fc16c3f4d65a5c8b67ab0127f1e18b46f5
authorMichael Terry <michael.terry@canonical.com>
dateTue 15 Jul 2014, 14:58 (12 years ago)
parent0b2938139bb27c
qml/Greeter/Greeter.qml+1−1
@@ -70,7 +70,7 @@ Showable {
7070 DraggingArea {
7171 id: dragHandle
7272 anchors.fill: parent
73− enabled: greeter.narrowMode || !greeter.locked
73+ enabled: (greeter.narrowMode || !greeter.locked) && greeter.enabled
7474 orientation: Qt.Horizontal
7575 propagateComposedEvents: true
7676