git.iko.soy/unity8
on xenial help sign in
s/isActive/active/ as per review nitpicks :D
commit365fd9e09f3c23816457bde087e21ab1f8e4e05e authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 29 Jul 2014, 15:45 (12 years ago) parent088b2c7
5 files changed+19−19
compare with xenial
unifiedsplit
qml/Shell.qml+1−1 qml/Stages/PhoneStage.qml+5−5 qml/Stages/TabletStage.qml+5−5 qml/Stages/TransformedSpreadDelegate.qml+3−3 qml/Stages/TransformedTabletSpreadDelegate.qml+5−5
qml/Shell.qml+1−1
@@ -39,7 +39,7 @@ Item {
3939 id: shell
4040
4141 // this is only here to select the width / height of the window if not running fullscreen
42− property bool tablet: false
42+ property bool tablet: true
4343 width: tablet ? units.gu(160) : applicationArguments.hasGeometry() ? applicationArguments.width() : units.gu(40)
4444 height: tablet ? units.gu(100) : applicationArguments.hasGeometry() ? applicationArguments.height() : units.gu(71)
4545
qml/Stages/PhoneStage.qml+5−5
@@ -116,7 +116,7 @@ Rectangle {
116116
117117 // This indicates when the spreadView is active. That means, all the animations
118118 // are activated and tiles need to line up for the spread.
119− readonly property bool isActive: shiftedContentX > 0 || spreadDragArea.dragging
119+ readonly property bool active: shiftedContentX > 0 || spreadDragArea.dragging
120120
121121 // The flickable needs to fill the screen in order to get touch events all over.
122122 // However, we don't want to the user to be able to scroll back all the way. For
@@ -268,12 +268,12 @@ Rectangle {
268268 && spreadView.shiftedContentX === 0 && root.interactive && index === 0
269269 swipeToCloseEnabled: spreadView.interactive
270270 maximizedAppTopMargin: root.maximizedAppTopMargin
271− dropShadow: spreadView.isActive ||
271+ dropShadow: spreadView.active ||
272272 priv.focusedAppDelegate.x !== 0
273273
274274 readonly property bool isDash: model.appId == "unity8-dash"
275275
276− z: isDash && !spreadView.isActive ? -1 : behavioredIndex
276+ z: isDash && !spreadView.active ? -1 : behavioredIndex
277277
278278 x: {
279279 // focused app is always positioned at 0 except when following left edge drag
@@ -283,7 +283,7 @@ Rectangle {
283283 }
284284 return 0;
285285 }
286− if (isDash && !spreadView.isActive && !spreadDragArea.dragging) {
286+ if (isDash && !spreadView.active && !spreadDragArea.dragging) {
287287 return 0;
288288 }
289289
@@ -305,7 +305,7 @@ Rectangle {
305305
306306 Behavior on x {
307307 enabled: root.spreadEnabled &&
308− !spreadView.isActive &&
308+ !spreadView.active &&
309309 !snapAnimation.running
310310 UbuntuNumberAnimation {
311311 duration: UbuntuAnimation.FastDuration
qml/Stages/TabletStage.qml+5−5
@@ -155,7 +155,7 @@ Rectangle {
155155
156156 // This indicates when the spreadView is active. That means, all the animations
157157 // are activated and tiles need to line up for the spread.
158− readonly property bool isActive: shiftedContentX > 0 || spreadDragArea.dragging
158+ readonly property bool active: shiftedContentX > 0 || spreadDragArea.dragging
159159
160160 // The flickable needs to fill the screen in order to get touch events all over.
161161 // However, we don't want to the user to be able to scroll back all the way. For
@@ -301,12 +301,12 @@ Rectangle {
301301 return index;
302302 }
303303
304− var isActive = app.appId == priv.mainStageAppId || app.appId == priv.sideStageAppId;
305− if (isActive && app.stage == ApplicationInfoInterface.MainStage) {
304+ var active = app.appId == priv.mainStageAppId || app.appId == priv.sideStageAppId;
305+ if (active && app.stage == ApplicationInfoInterface.MainStage) {
306306 // if this app is active, and its the MainStage, always put it to index 0
307307 return 0;
308308 }
309− if (isActive && app.stage == ApplicationInfoInterface.SideStage) {
309+ if (active && app.stage == ApplicationInfoInterface.SideStage) {
310310 if (!priv.mainStageAppId) {
311311 // Only have SS apps running. Put the active one at 0
312312 return 0;
@@ -483,7 +483,7 @@ Rectangle {
483483 Binding {
484484 target: spreadTile
485485 property: "z"
486− value: (!spreadView.isActive && isDash && !active) ? -1 : spreadTile.zIndex
486+ value: (!spreadView.active && isDash && !active) ? -1 : spreadTile.zIndex
487487 }
488488 x: spreadView.width
489489
qml/Stages/TransformedSpreadDelegate.qml+3−3
@@ -129,7 +129,7 @@ SpreadDelegate {
129129 // the selected tile, which is animated from the snapshotted position to be fullscreen.
130130
131131 readonly property real xTranslate: {
132− if (!spreadView.isActive) {
132+ if (!spreadView.active) {
133133 return 0;
134134 }
135135
@@ -184,7 +184,7 @@ SpreadDelegate {
184184 }
185185
186186 readonly property real angle: {
187− if (!spreadView.isActive) {
187+ if (!spreadView.active) {
188188 return 0;
189189 }
190190
@@ -217,7 +217,7 @@ SpreadDelegate {
217217 }
218218
219219 readonly property real scale: {
220− if (!spreadView.isActive) {
220+ if (!spreadView.active) {
221221 return 1;
222222 }
223223 if (priv.otherSelected) {
qml/Stages/TransformedTabletSpreadDelegate.qml+5−5
@@ -49,7 +49,7 @@ SpreadDelegate {
4949
5050 property int dragOffset: 0
5151
52− dropShadow: spreadView.isActive ||
52+ dropShadow: spreadView.active ||
5353 (active && model.stage == ApplicationInfoInterface.MainStage && priv.xTranslate != 0)
5454
5555 onSelectedChanged: {
@@ -135,7 +135,7 @@ SpreadDelegate {
135135 }
136136
137137 Behavior on xTranslate {
138− enabled: !spreadView.isActive &&
138+ enabled: !spreadView.active &&
139139 !snapAnimation.running &&
140140 model.appId !== "unity8-dash" &&
141141 !spreadView.sideStageDragging
@@ -172,7 +172,7 @@ SpreadDelegate {
172172 }
173173 newTranslate += root.dragOffset;
174174 }
175− if (!spreadView.isActive && model.appId == "unity8-dash" && !root.active) {
175+ if (!spreadView.active && model.appId == "unity8-dash" && !root.active) {
176176 newTranslate -= root.width;
177177 }
178178
@@ -225,7 +225,7 @@ SpreadDelegate {
225225 }
226226
227227 property real scale: {
228− if (!spreadView.isActive) {
228+ if (!spreadView.active) {
229229 return 1;
230230 }
231231
@@ -273,7 +273,7 @@ SpreadDelegate {
273273 }
274274
275275 property real angle: {
276− if (!spreadView.isActive) {
276+ if (!spreadView.active) {
277277 return 0;
278278 }
279279