9daf05f · unity8 · git.iko.soy

Components/EdgeDemo.qml+1−1

@@ -169,7 +169,7 @@ Item {

169 "edge": "bottom",

170 "title": i18n.tr("Close"),

171 "text": i18n.tr("Swipe up again to close the settings screen"),

172− "anchors.fill": demo.indicators,

172+ "anchors.fill": demo.indicators.content,

173 });

174 }

175 if (d.bottomEdgeDemo) {

Components/EdgeDemoOverlay.qml+3

@@ -153,7 +153,10 @@ Showable {

153 font.underline: true

154

155 MouseArea {

156+ // Make clickable area bigger than just the link because

157+ // otherwise, the edge demo will feel hard to dismiss.

156 anchors.fill: parent

158 anchors.fill: parent

159+ anchors.margins: -units.gu(5)

157 onClicked: overlay.doSkip()

160 onClicked: overlay.doSkip()

158 }

161 }

159 }

162 }

Panel/Indicators.qml+1

@@ -35,6 +35,7 @@ Showable {

35 property bool partiallyOpened: height > panelHeight && !fullyOpened

36 property real visualBottom: Math.max(y+height, y+indicatorRow.y+indicatorRow.height)

37 property bool contentEnabled: true

38+ readonly property alias content: menuContent

38

39

39 // TODO: Perhaps we need a animation standard for showing/hiding? Each showable seems to

40 // TODO: Perhaps we need a animation standard for showing/hiding? Each showable seems to

40 // use its own values. Need to ask design about this.

41 // use its own values. Need to ask design about this.