Unity 8

Merge lp:~mterry/unity8/bigger-skip into lp:unity8

  1. bigger-skip
  2. Merge into trunk
Proposed by Michael Terry
Status: Merged
Approved by: Michał Sawicz
Approved revision: 326
Merged at revision: 345
Proposed branch: lp:~mterry/unity8/bigger-skip
Merge into: lp:unity8
Diff against target: 39 lines (+5/-1)
3 files modified
Components/EdgeDemo.qml (+1/-1)
Components/EdgeDemoOverlay.qml (+3/-0)
Panel/Indicators.qml (+1/-0)
To merge this branch: bzr merge lp:~mterry/unity8/bigger-skip
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michał Sawicz Approve
Katie Taylor design Pending
Review via email: mp+185863@code.launchpad.net

Commit message

Increase the "Skip intro" clickable area, making dismissing the edge demo intro feel more natural.

Description of the change

Increase the "Skip intro" clickable area, making dismissing the edge demo intro feel more natural.

I arbitrarily chose gu(10) for the increased size. I also moved the bottom edge demo up above the drag handle, because (A) I believe that's closer to what design wanted and (B) it prevents our clickable area from interfering with the drag handle.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:324
http://jenkins.qa.ubuntu.com/job/unity8-ci/1016/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3468
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/996
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1709
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1017
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1017/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1016
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3480
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3480/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2935
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/998
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/998/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/836
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/848

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:324
http://jenkins.qa.ubuntu.com/job/unity8-ci/1036/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3581/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1753
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1037
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1037/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1036
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3593
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3593/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/3039/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1111
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1111/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/916
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/928

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:324
http://jenkins.qa.ubuntu.com/job/unity8-ci/1039/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3612
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1140/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1760
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1040
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1040/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1039
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3624
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3624/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/3066
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1142
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/940
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/952/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

24 + anchors.centerIn: parent
25 + width: parent.width + units.gu(10)
26 + height: parent.height + units.gu(10)

anchors {
    fill: parent
    margins: -units.gu(10)
}

using anchors is faster than width and height

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:324
http://jenkins.qa.ubuntu.com/job/unity8-ci/1081/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3897
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1463
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1820/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1082
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1082/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1081
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3947
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3947/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1465
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1465/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1234
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1245

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:324
http://jenkins.qa.ubuntu.com/job/unity8-ci/1091/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3913
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1486
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1831
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/115
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1092
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1092/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1091
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/244
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3970
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3970/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1488
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1488/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1265

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

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

mterry, can you please apply mzanetti's comment above?

lp:~mterry/unity8/bigger-skip updated
325. By Michael Terry

Use anchors.margins instead of modifying height/width; make extra margin smaller (but still big)

326. By Michael Terry

Merge from trunk

Revision history for this message
Michael Terry (mterry) wrote :

Done, thanks mzanetti.

Revision history for this message
Michał Sawicz (saviq) wrote :

We sure the anchors.fill are correct? It's not a direct child or a sibling of demo.indicators.content, so it can't anchor to it?

review: Needs Information
Revision history for this message
Michael Terry (mterry) wrote :

Only direct children/siblings can use anchors.fill? It seems to work for me. Trunk has the edge animation at the very bottom of the screen. This branch has it at the top of the drag handle.

Revision history for this message
Michael Terry (mterry) wrote :

Ah. But the EdgeDemoOverlay is a sibling of demo.indicators.content, because its parent is demo.indicators. So that's why it works fine.

Revision history for this message
Michał Sawicz (saviq) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:326
http://jenkins.qa.ubuntu.com/job/unity8-ci/1104/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3954
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1546
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1846
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1104
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1104/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4028
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4028/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1548
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1548/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1305
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1316

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity8-ci/1104/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 'Components/EdgeDemo.qml'
2--- Components/EdgeDemo.qml 2013-09-04 17:57:57 +0000
3+++ Components/EdgeDemo.qml 2013-09-24 19:00:56 +0000
4@@ -169,7 +169,7 @@
5 "edge": "bottom",
6 "title": i18n.tr("Close"),
7 "text": i18n.tr("Swipe up again to close the settings screen"),
8- "anchors.fill": demo.indicators,
9+ "anchors.fill": demo.indicators.content,
10 });
11 }
12 if (d.bottomEdgeDemo) {
13
14=== modified file 'Components/EdgeDemoOverlay.qml'
15--- Components/EdgeDemoOverlay.qml 2013-09-04 13:42:27 +0000
16+++ Components/EdgeDemoOverlay.qml 2013-09-24 19:00:56 +0000
17@@ -153,7 +153,10 @@
18 font.underline: true
19
20 MouseArea {
21+ // Make clickable area bigger than just the link because
22+ // otherwise, the edge demo will feel hard to dismiss.
23 anchors.fill: parent
24+ anchors.margins: -units.gu(5)
25 onClicked: overlay.doSkip()
26 }
27 }
28
29=== modified file 'Panel/Indicators.qml'
30--- Panel/Indicators.qml 2013-09-06 14:09:56 +0000
31+++ Panel/Indicators.qml 2013-09-24 19:00:56 +0000
32@@ -35,6 +35,7 @@
33 property bool partiallyOpened: height > panelHeight && !fullyOpened
34 property real visualBottom: Math.max(y+height, y+indicatorRow.y+indicatorRow.height)
35 property bool contentEnabled: true
36+ readonly property alias content: menuContent
37
38 // TODO: Perhaps we need a animation standard for showing/hiding? Each showable seems to
39 // use its own values. Need to ask design about this.

Subscribers

People subscribed via source and target branches