on xenial help sign in
Merge from dash-app-fixes
commit9f3bb4b2aa7fd1e9415da7121ea74971a3429cff authorMichael Terry <michael.terry@canonical.com> dateWed 6 Aug 2014, 10:18 (12 years ago) parentf80968c11e593c
3 files changed+19−30
qml/Components/EdgeDemo.qml+10−10 qml/Dash/Dash.qml+8 qml/Shell.qml+1−20
qml/Components/EdgeDemo.qml+10−10
@@ -24,7 +24,7 @@ Item {
2424 property Item greeter
2525 property Item launcher
2626 property Item indicators
27− property Item underlay
27+ property Item stages
2828
2929 property bool launcherEnabled: true
3030 property bool dashEnabled: true
@@ -138,12 +138,12 @@ Item {
138138
139139 function startTopEdgeDemo() {
140140 demo.panelEnabled = true;
141− if (demo.dash && demo.underlay) {
142− d.topEdgeDemo = d.overlay.createObject(demo.underlay, {
141+ if (demo.dash && demo.stages) {
142+ d.topEdgeDemo = d.overlay.createObject(demo.stages, {
143143 "edge": "top",
144144 "title": i18n.tr("Top edge"),
145145 "text": i18n.tr("Try swiping from the top edge to access the indicators"),
146− "anchors.fill": demo.underlay,
146+ "anchors.fill": demo.stages,
147147 });
148148 }
149149 if (d.topEdgeDemo) {
@@ -192,12 +192,12 @@ Item {
192192 function startLeftEdgeDemo() {
193193 demo.panelEnabled = false;
194194 demo.launcherEnabled = true;
195− if (demo.underlay) {
196− d.leftEdgeDemo = d.overlay.createObject(demo.underlay, {
195+ if (demo.stages) {
196+ d.leftEdgeDemo = d.overlay.createObject(demo.stages, {
197197 "edge": "left",
198198 "title": i18n.tr("Left edge"),
199199 "text": i18n.tr("Swipe from the left to reveal the launcher for quick access to apps"),
200− "anchors.fill": demo.underlay,
200+ "anchors.fill": demo.stages,
201201 });
202202 }
203203 if (d.leftEdgeDemo) {
@@ -220,12 +220,12 @@ Item {
220220
221221 function startFinalEdgeDemo() {
222222 demo.launcherEnabled = false;
223− if (demo.underlay) {
224− d.finalEdgeDemo = d.overlay.createObject(demo.underlay, {
223+ if (demo.stages) {
224+ d.finalEdgeDemo = d.overlay.createObject(demo.stages, {
225225 "edge": "none",
226226 "title": i18n.tr("Well done"),
227227 "text": i18n.tr("You have now mastered the edge gestures and can start using the phone<br><br>Tap on the screen to start"),
228− "anchors.fill": demo.underlay,
228+ "anchors.fill": demo.stages,
229229 "showSkip": false,
230230 });
231231 }
qml/Dash/Dash.qml+8
@@ -74,6 +74,14 @@ Showable {
7474 filterRegExp: RegExp("^true$")
7575 }
7676
77+ Image {
78+ anchors.fill: parent
79+ source: parent.width > parent.height ? "graphics/paper_landscape.png" : "graphics/paper_portrait.png"
80+ fillMode: Image.PreserveAspectCrop
81+ horizontalAlignment: Image.AlignRight
82+ verticalAlignment: Image.AlignTop
83+ }
84+
7785 DashContent {
7886 id: dashContent
7987 objectName: "dashContent"
qml/Shell.qml+1−20
@@ -112,25 +112,6 @@ Item {
112112 }
113113 }
114114
115− Item {
116− id: underlay
117− objectName: "underlay"
118− anchors.fill: parent
119−
120− // Whether the underlay is fully covered by opaque UI elements.
121− property bool fullyCovered: (panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth)
122− || stages.fullyShown || greeterWrapper.fullyShown
123− visible: !fullyCovered
124−
125− Image {
126− anchors.fill: underlay
127− source: shell.width > shell.height ? "Dash/graphics/paper_landscape.png" : "Dash/graphics/paper_portrait.png"
128− fillMode: Image.PreserveAspectCrop
129− horizontalAlignment: Image.AlignRight
130− verticalAlignment: Image.AlignTop
131− }
132− }
133−
134115 Item {
135116 id: stages
136117 objectName: "stages"
@@ -580,7 +561,7 @@ Item {
580561 greeter: greeter
581562 launcher: launcher
582563 indicators: panel.indicators
583− underlay: underlay
564+ stages: stages
584565 }
585566
586567 Connections {