on xenial help sign in
Increase the "Skip intro" clickable area, making dismissing the edge demo intro feel more natural. Fixes: https://bugs.launchpad.net/bugs/1220632.

Approved by PS Jenkins bot, Michał Sawicz.

commit9daf05f566ebc9bbdd11a2db6946307e12de0b6d authorMichael Terry <michael.terry@canonical.com> dateWed 25 Sep 2013, 01:00 (13 years ago) parent6195e89e8ce052
3 files changed+5−1
Components/EdgeDemo.qml+1−1 Components/EdgeDemoOverlay.qml+3 Panel/Indicators.qml+1
Components/EdgeDemo.qml+1−1
@@ -169,7 +169,7 @@ Item {
169169 "edge": "bottom",
170170 "title": i18n.tr("Close"),
171171 "text": i18n.tr("Swipe up again to close the settings screen"),
172− "anchors.fill": demo.indicators,
172+ "anchors.fill": demo.indicators.content,
173173 });
174174 }
175175 if (d.bottomEdgeDemo) {
Components/EdgeDemoOverlay.qml+3
@@ -153,7 +153,10 @@ Showable {
153153 font.underline: true
154154
155155 MouseArea {
156+ // Make clickable area bigger than just the link because
157+ // otherwise, the edge demo will feel hard to dismiss.
156158 anchors.fill: parent
159+ anchors.margins: -units.gu(5)
157160 onClicked: overlay.doSkip()
158161 }
159162 }
Panel/Indicators.qml+1
@@ -35,6 +35,7 @@ Showable {
3535 property bool partiallyOpened: height > panelHeight && !fullyOpened
3636 property real visualBottom: Math.max(y+height, y+indicatorRow.y+indicatorRow.height)
3737 property bool contentEnabled: true
38+ readonly property alias content: menuContent
3839
3940 // TODO: Perhaps we need a animation standard for showing/hiding? Each showable seems to
4041 // use its own values. Need to ask design about this.