git.iko.soy/unity8
on xenial help sign in
edge hinting tweaks
90ada3cMichael Zanetti
Greeter/Greeter.qml+2−2
compare with xenial
unifiedsplit
@@ -48,7 +48,7 @@ Showable {
48 signal unlocked(int uid)
48 signal unlocked(int uid)
49
49
50 onRightTeaserPressedChanged: {
50 onRightTeaserPressedChanged: {
51− if (rightTeaserPressed) {
51+ if (rightTeaserPressed && !locked) {
52 teasingTimer.start();
52 teasingTimer.start();
53 }
53 }
54 }
54 }
@@ -81,7 +81,7 @@ Showable {
81 states: [
81 states: [
82 State {
82 State {
83 name: "teasing"
83 name: "teasing"
84− when: greeter.rightTeaserPressed || teasingTimer.running
84+ when: teasingTimer.running
85 PropertyChanges {
85 PropertyChanges {
86 target: greeter
86 target: greeter
87 x: -units.gu(2)
87 x: -units.gu(2)
Launcher/Launcher.qml+3−4
@@ -25,7 +25,6 @@ Item {
25
25
26 property bool available: true // can be used to disable all interactions
26 property bool available: true // can be used to disable all interactions
27
27
28− property bool teasing: false
29 property int panelWidth: units.gu(8.5)
28 property int panelWidth: units.gu(8.5)
30 property int dragAreaWidth: units.gu(1)
29 property int dragAreaWidth: units.gu(1)
31 property real progress: dragArea.dragging && dragArea.touchX > panel.width ? dragArea.touchX : 0
30 property real progress: dragArea.dragging && dragArea.touchX > panel.width ? dragArea.touchX : 0
@@ -58,8 +57,8 @@ Item {
58 animateTimer.start();
57 animateTimer.start();
59 }
58 }
60
59
61− onTeasingChanged: {
60+ function tease() {
62− if (teasing) {
61+ if (available) {
63 teaseTimer.start();
62 teaseTimer.start();
64 }
63 }
65 }
64 }
@@ -244,7 +243,7 @@ Item {
244 },
243 },
245 State {
244 State {
246 name: "teasing"
245 name: "teasing"
247− when: root.teasing || teaseTimer.running
246+ when: teaseTimer.running
248 PropertyChanges {
247 PropertyChanges {
249 target: panel
248 target: panel
250 x: -root.panelWidth + units.gu(2)
249 x: -root.panelWidth + units.gu(2)
Shell.qml+6−1
@@ -439,6 +439,12 @@ FocusScope {
439 var bgPath = greeter.model.data(uid, LightDM.UserRoles.BackgroundPathRole)
439 var bgPath = greeter.model.data(uid, LightDM.UserRoles.BackgroundPathRole)
440 shell.background = bgPath ? bgPath : default_background
440 shell.background = bgPath ? bgPath : default_background
441 }
441 }
442+
443+ onLeftTeaserPressedChanged: {
444+ if (leftTeaserPressed) {
445+ launcher.tease();
446+ }
447+ }
442 }
448 }
443
449
444 InputFilterArea {
450 InputFilterArea {
@@ -532,7 +538,6 @@ FocusScope {
532 width: parent.width
538 width: parent.width
533 dragAreaWidth: shell.edgeSize
539 dragAreaWidth: shell.edgeSize
534 available: !greeter.locked
540 available: !greeter.locked
535− teasing: available && greeter.leftTeaserPressed
536 onDashItemSelected: {
541 onDashItemSelected: {
537 greeter.hide()
542 greeter.hide()
538 // Animate if moving between application and dash
543 // Animate if moving between application and dash