Merge lp:~mterry/unity8/no-greeter-drag-if-hidden into lp:unity8

[Michael Terry]

Don't allow dragging the greeter out from the left edge if it's hidden there.

Don't allow dragging the greeter out from the left edge if it's hidden there.

== Checklist ==

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
 Yes

 * Did you make sure that your branch does not contain spurious tags?
 Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 NA

 * If you changed the UI, has there been a design review?
 NA

[lp:~mterry/unity8/no-greeter-drag-if-hidden]

1450. By Michael Terry on 2014-11-21

Don't let user drag greeter out from left edge of screen when it's hidden

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1450
http://jenkins.qa.ubuntu.com/job/unity8-ci/4956/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/321
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/121
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/293
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/321
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/321/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16128

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

tested, works fine, but...

tags :/

review: Needs Fixing

[lp:~mterry/unity8/no-greeter-drag-if-hidden]

1451. By Michael Terry on 2014-11-24

Merge from trunk

[Michael Terry (mterry)]

Try now? I didn't have tags in my local branch. But I merged from trunk, checked again, and pushed again. Maybe this will do the trick.

[Michael Zanetti (mzanetti)]

> Try now? I didn't have tags in my local branch. But I merged from trunk,
> checked again, and pushed again. Maybe this will do the trick.

http://paste.ubuntu.com/9214916/

[Michael Terry (mterry)]

OK, try *now*. I guess fixing locally and pushing doesn't solve it (unless I pass --overwrite). So I pointed the strip script at the remote branch and it cleaned things up.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1451
http://jenkins.qa.ubuntu.com/job/unity8-ci/4962/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/330
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/301
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/330
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/330/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16170

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Looks fine to me:

⟫ ./strip-tags.py lp:~mterry/unity8/no-greeter-drag-if-hidden
lp:~mterry/unity8/no-greeter-drag-if-hidden: clean

Hint: there's a modernized script that does not have a hardcoded list
any more: http://people.canonical.com/~msawicz/unity8/strip-tags.py

[Michael Zanetti (mzanetti)]

Yep, looks good now.

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes

 * Did CI run pass? If not, please explain why.

The known failures which are fixed in trunk now.

 * Did you make sure that the branch does not contain spurious tags?

Yes, fine now.

review: Approve

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-11-17 13:47:59 +0000
+++ qml/Shell.qml	2014-11-24 13:32:49 +0000
@@ -495,7 +495,7 @@
         // Just a tiny wrapper to adjust greeter's x without messing with its own dragging
         id: greeterWrapper
         objectName: "greeterWrapper"
-        x: greeter.narrowMode ? launcher.progress : 0
+        x: (greeter.narrowMode && greeter.showProgress > 0) ? launcher.progress : 0
         y: panel.panelHeight
         width: parent.width
         height: parent.height - panel.panelHeight