git.iko.soy/unity8
on xenial help sign in
s/isActive/active/ as per review nitpicks :D
365fd9eMichael Zanetti
qml/Shell.qml+1−1
compare with xenial
unifiedsplit
@@ -39,7 +39,7 @@ Item {
39 id: shell
39 id: shell
40
40
41 // this is only here to select the width / height of the window if not running fullscreen
41 // 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
43 width: tablet ? units.gu(160) : applicationArguments.hasGeometry() ? applicationArguments.width() : units.gu(40)
43 width: tablet ? units.gu(160) : applicationArguments.hasGeometry() ? applicationArguments.width() : units.gu(40)
44 height: tablet ? units.gu(100) : applicationArguments.hasGeometry() ? applicationArguments.height() : units.gu(71)
44 height: tablet ? units.gu(100) : applicationArguments.hasGeometry() ? applicationArguments.height() : units.gu(71)
45
45
qml/Stages/PhoneStage.qml+5−5
@@ -116,7 +116,7 @@ Rectangle {
116
116
117 // This indicates when the spreadView is active. That means, all the animations
117 // This indicates when the spreadView is active. That means, all the animations
118 // are activated and tiles need to line up for the spread.
118 // 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
120
120
121 // The flickable needs to fill the screen in order to get touch events all over.
121 // The flickable needs to fill the screen in order to get touch events all over.
122 // However, we don't want to the user to be able to scroll back all the way. For
122 // However, we don't want to the user to be able to scroll back all the way. For
@@ -268,12 +268,12 @@ Rectangle {
268 && spreadView.shiftedContentX === 0 && root.interactive && index === 0
268 && spreadView.shiftedContentX === 0 && root.interactive && index === 0
269 swipeToCloseEnabled: spreadView.interactive
269 swipeToCloseEnabled: spreadView.interactive
270 maximizedAppTopMargin: root.maximizedAppTopMargin
270 maximizedAppTopMargin: root.maximizedAppTopMargin
271− dropShadow: spreadView.isActive ||
271+ dropShadow: spreadView.active ||
272 priv.focusedAppDelegate.x !== 0
272 priv.focusedAppDelegate.x !== 0
273
273
274 readonly property bool isDash: model.appId == "unity8-dash"
274 readonly property bool isDash: model.appId == "unity8-dash"
275
275
276− z: isDash && !spreadView.isActive ? -1 : behavioredIndex
276+ z: isDash && !spreadView.active ? -1 : behavioredIndex
277
277
278 x: {
278 x: {
279 // focused app is always positioned at 0 except when following left edge drag
279 // focused app is always positioned at 0 except when following left edge drag
@@ -283,7 +283,7 @@ Rectangle {
283 }
283 }
284 return 0;
284 return 0;
285 }
285 }
286− if (isDash && !spreadView.isActive && !spreadDragArea.dragging) {
286+ if (isDash && !spreadView.active && !spreadDragArea.dragging) {
287 return 0;
287 return 0;
288 }
288 }
289
289
@@ -305,7 +305,7 @@ Rectangle {
305
305
306 Behavior on x {
306 Behavior on x {
307 enabled: root.spreadEnabled &&
307 enabled: root.spreadEnabled &&
308− !spreadView.isActive &&
308+ !spreadView.active &&
309 !snapAnimation.running
309 !snapAnimation.running
310 UbuntuNumberAnimation {
310 UbuntuNumberAnimation {
311 duration: UbuntuAnimation.FastDuration
311 duration: UbuntuAnimation.FastDuration
qml/Stages/TabletStage.qml+5−5
@@ -155,7 +155,7 @@ Rectangle {
155
155
156 // This indicates when the spreadView is active. That means, all the animations
156 // This indicates when the spreadView is active. That means, all the animations
157 // are activated and tiles need to line up for the spread.
157 // 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
159
159
160 // The flickable needs to fill the screen in order to get touch events all over.
160 // The flickable needs to fill the screen in order to get touch events all over.
161 // However, we don't want to the user to be able to scroll back all the way. For
161 // However, we don't want to the user to be able to scroll back all the way. For
@@ -301,12 +301,12 @@ Rectangle {
301 return index;
301 return index;
302 }
302 }
303
303
304− var isActive = app.appId == priv.mainStageAppId || app.appId == priv.sideStageAppId;
304+ var active = app.appId == priv.mainStageAppId || app.appId == priv.sideStageAppId;
305− if (isActive && app.stage == ApplicationInfoInterface.MainStage) {
305+ if (active && app.stage == ApplicationInfoInterface.MainStage) {
306 // if this app is active, and its the MainStage, always put it to index 0
306 // if this app is active, and its the MainStage, always put it to index 0
307 return 0;
307 return 0;
308 }
308 }
309− if (isActive && app.stage == ApplicationInfoInterface.SideStage) {
309+ if (active && app.stage == ApplicationInfoInterface.SideStage) {
310 if (!priv.mainStageAppId) {
310 if (!priv.mainStageAppId) {
311 // Only have SS apps running. Put the active one at 0
311 // Only have SS apps running. Put the active one at 0
312 return 0;
312 return 0;
@@ -483,7 +483,7 @@ Rectangle {
483 Binding {
483 Binding {
484 target: spreadTile
484 target: spreadTile
485 property: "z"
485 property: "z"
486− value: (!spreadView.isActive && isDash && !active) ? -1 : spreadTile.zIndex
486+ value: (!spreadView.active && isDash && !active) ? -1 : spreadTile.zIndex
487 }
487 }
488 x: spreadView.width
488 x: spreadView.width
489
489
qml/Stages/TransformedSpreadDelegate.qml+3−3
@@ -129,7 +129,7 @@ SpreadDelegate {
129 // the selected tile, which is animated from the snapshotted position to be fullscreen.
129 // the selected tile, which is animated from the snapshotted position to be fullscreen.
130
130
131 readonly property real xTranslate: {
131 readonly property real xTranslate: {
132− if (!spreadView.isActive) {
132+ if (!spreadView.active) {
133 return 0;
133 return 0;
134 }
134 }
135
135
@@ -184,7 +184,7 @@ SpreadDelegate {
184 }
184 }
185
185
186 readonly property real angle: {
186 readonly property real angle: {
187− if (!spreadView.isActive) {
187+ if (!spreadView.active) {
188 return 0;
188 return 0;
189 }
189 }
190
190
@@ -217,7 +217,7 @@ SpreadDelegate {
217 }
217 }
218
218
219 readonly property real scale: {
219 readonly property real scale: {
220− if (!spreadView.isActive) {
220+ if (!spreadView.active) {
221 return 1;
221 return 1;
222 }
222 }
223 if (priv.otherSelected) {
223 if (priv.otherSelected) {
qml/Stages/TransformedTabletSpreadDelegate.qml+5−5
@@ -49,7 +49,7 @@ SpreadDelegate {
49
49
50 property int dragOffset: 0
50 property int dragOffset: 0
51
51
52− dropShadow: spreadView.isActive ||
52+ dropShadow: spreadView.active ||
53 (active && model.stage == ApplicationInfoInterface.MainStage && priv.xTranslate != 0)
53 (active && model.stage == ApplicationInfoInterface.MainStage && priv.xTranslate != 0)
54
54
55 onSelectedChanged: {
55 onSelectedChanged: {
@@ -135,7 +135,7 @@ SpreadDelegate {
135 }
135 }
136
136
137 Behavior on xTranslate {
137 Behavior on xTranslate {
138− enabled: !spreadView.isActive &&
138+ enabled: !spreadView.active &&
139 !snapAnimation.running &&
139 !snapAnimation.running &&
140 model.appId !== "unity8-dash" &&
140 model.appId !== "unity8-dash" &&
141 !spreadView.sideStageDragging
141 !spreadView.sideStageDragging
@@ -172,7 +172,7 @@ SpreadDelegate {
172 }
172 }
173 newTranslate += root.dragOffset;
173 newTranslate += root.dragOffset;
174 }
174 }
175− if (!spreadView.isActive && model.appId == "unity8-dash" && !root.active) {
175+ if (!spreadView.active && model.appId == "unity8-dash" && !root.active) {
176 newTranslate -= root.width;
176 newTranslate -= root.width;
177 }
177 }
178
178
@@ -225,7 +225,7 @@ SpreadDelegate {
225 }
225 }
226
226
227 property real scale: {
227 property real scale: {
228− if (!spreadView.isActive) {
228+ if (!spreadView.active) {
229 return 1;
229 return 1;
230 }
230 }
231
231
@@ -273,7 +273,7 @@ SpreadDelegate {
273 }
273 }
274
274
275 property real angle: {
275 property real angle: {
276− if (!spreadView.isActive) {
276+ if (!spreadView.active) {
277 return 0;
277 return 0;
278 }
278 }
279
279