Merge lp:~mzanetti/unity8/fix-1213153 into lp:unity8

Proposed by Michael Zanetti
Status: Merged
Approved by: Nicolas d'Offay
Approved revision: 244
Merged at revision: 260
Proposed branch: lp:~mzanetti/unity8/fix-1213153
Merge into: lp:unity8
Diff against target: 23 lines (+4/-2)
1 file modified
Launcher/Launcher.qml (+4/-2)
To merge this branch: bzr merge lp:~mzanetti/unity8/fix-1213153
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Nicolas d'Offay (community) Approve
Review via email: mp+182406@code.launchpad.net

Commit message

increase minimal dragging width for dismissing apps with left edge

make it a configurable parameter and adjust animation to look like requested in the bug report

To post a comment you must log in.
Revision history for this message
Nicolas d'Offay (nicolas-doffay) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Launcher/Launcher.qml'
--- Launcher/Launcher.qml 2013-08-21 15:11:50 +0000
+++ Launcher/Launcher.qml 2013-08-27 14:34:36 +0000
@@ -28,7 +28,9 @@
2828
29 property int panelWidth: units.gu(8)29 property int panelWidth: units.gu(8)
30 property int dragAreaWidth: units.gu(1)30 property int dragAreaWidth: units.gu(1)
31 property real progress: dragArea.dragging && dragArea.touchX > panel.width ? dragArea.touchX : 031 property int minimizeDistance: panelWidth * 2.5
32 property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?
33 (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) : 0
3234
33 readonly property bool shown: panel.x > -panel.width35 readonly property bool shown: panel.x > -panel.width
3436
@@ -206,7 +208,7 @@
206 if (!dragging) {208 if (!dragging) {
207 if (distance > panel.width / 2) {209 if (distance > panel.width / 2) {
208 root.switchToNextState("visible")210 root.switchToNextState("visible")
209 if (distance > panel.width * 2) {211 if (distance > minimizeDistance) {
210 root.dash()212 root.dash()
211 }213 }
212 } else {214 } else {

Subscribers

People subscribed via source and target branches