Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
glacier-home
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
NemoMobile
glacier-home
Commits
d44f255d
Commit
d44f255d
authored
Jan 17, 2017
by
Sergey Chupligin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Compositor] fix lockscreen swipe
parent
545418a0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
6 deletions
+3
-6
compositor.qml
src/qml/compositor.qml
+3
-6
No files found.
src/qml/compositor.qml
View file @
d44f255d
...
@@ -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
.
Unl
ocked
enabled
:
DeviceLock
.
state
!=
DeviceLock
.
L
ocked
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment