Commit d44f255d authored by Sergey Chupligin's avatar Sergey Chupligin

[Compositor] fix lockscreen swipe

parent 545418a0
...@@ -135,7 +135,7 @@ Compositor { ...@@ -135,7 +135,7 @@ Compositor {
property real lockThreshold: 0.25 property real lockThreshold: 0.25
property int lockscreenX property int lockscreenX
property int lockscreenY property int lockscreenY
enabled: DeviceLock.state == DeviceLock.Unlocked enabled: DeviceLock.state != DeviceLock.Locked
onGestureStarted: { onGestureStarted: {
swipeAnimation.stop() swipeAnimation.stop()
...@@ -143,10 +143,6 @@ Compositor { ...@@ -143,10 +143,6 @@ Compositor {
lockAnimation.stop() lockAnimation.stop()
if (root.appActive) { if (root.appActive) {
state = "swipe" state = "swipe"
} else if (root.homeActive) {
lockscreenX = Desktop.instance.lockscreen.x
lockscreenY = Desktop.instance.lockscreen.y
state = "lock"
} }
} }
...@@ -182,7 +178,7 @@ Compositor { ...@@ -182,7 +178,7 @@ Compositor {
states: [ states: [
State { State {
name: "swipe" name: "swipe"
when: DeviceLock.state != DeviceLock.Locked
PropertyChanges { PropertyChanges {
target: gestureArea target: gestureArea
delayReset: true delayReset: true
...@@ -196,6 +192,7 @@ Compositor { ...@@ -196,6 +192,7 @@ Compositor {
}, },
State { State {
name: "lock" name: "lock"
when: DeviceLock.state == DeviceLock.Locked
PropertyChanges { PropertyChanges {
target: Desktop.instance.lockscreen target: Desktop.instance.lockscreen
visible: true visible: true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment