Unity 8

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

  1. fix-1213153
  2. Merge into trunk
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 :

PASSED: Continuous integration, rev:244
http://jenkins.qa.ubuntu.com/job/unity8-ci/792/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2686
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/311
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1379
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/793
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/793/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/792
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2692
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2692/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2277
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/313
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/313/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/279
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/286

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/792/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Launcher/Launcher.qml'
2--- Launcher/Launcher.qml 2013-08-21 15:11:50 +0000
3+++ Launcher/Launcher.qml 2013-08-27 14:34:36 +0000
4@@ -28,7 +28,9 @@
5
6 property int panelWidth: units.gu(8)
7 property int dragAreaWidth: units.gu(1)
8- property real progress: dragArea.dragging && dragArea.touchX > panel.width ? dragArea.touchX : 0
9+ property int minimizeDistance: panelWidth * 2.5
10+ property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?
11+ (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) : 0
12
13 readonly property bool shown: panel.x > -panel.width
14
15@@ -206,7 +208,7 @@
16 if (!dragging) {
17 if (distance > panel.width / 2) {
18 root.switchToNextState("visible")
19- if (distance > panel.width * 2) {
20+ if (distance > minimizeDistance) {
21 root.dash()
22 }
23 } else {

Subscribers

People subscribed via source and target branches