git.iko.soy/unity8
on xenial help sign in
mark locked property in stages readonly, drop unused fullscreen property
c527906Michael Zanetti
qml/Stages/PhoneStage.qml+1−12
compare with xenial
unifiedsplit
@@ -30,8 +30,7 @@ Item {
30 property bool interactive
30 property bool interactive
31
31
32 // State information propagated to the outside
32 // State information propagated to the outside
33− property bool fullscreen: priv.focusedApplication ? priv.focusedApplication.fullscreen : false
34− property bool locked: spreadView.phase == 2
33+ readonly property bool locked: spreadView.phase == 2
35
34
36 function select(appId) {
35 function select(appId) {
37 spreadView.snapTo(priv.indexOf(appId))
36 spreadView.snapTo(priv.indexOf(appId))
@@ -54,14 +53,6 @@ Item {
54 }
53 }
55 }
54 }
56
55
57− onFocusedApplicationIdChanged: {
58− if (ApplicationManager.focusedApplicationId.length > 0) {
59− var application = priv.focusedApplication;
60− root.fullscreen = application.fullscreen;
61− var appIndex = priv.indexOf(application.appId);
62− }
63− }
64−
65 onApplicationAdded: {
56 onApplicationAdded: {
66 if (spreadView.phase == 2) {
57 if (spreadView.phase == 2) {
67 spreadView.snapTo(ApplicationManager.count - 1);
58 spreadView.snapTo(ApplicationManager.count - 1);
@@ -90,7 +81,6 @@ Item {
90
81
91 function switchToApp(appId) {
82 function switchToApp(appId) {
92 if (priv.focusedAppId) {
83 if (priv.focusedAppId) {
93− root.fullscreen = ApplicationManager.findApplication(appId).fullscreen;
94 spreadView.focusChanging = true
84 spreadView.focusChanging = true
95 ApplicationManager.focusApplication(appId);
85 ApplicationManager.focusApplication(appId);
96 } else {
86 } else {
@@ -197,7 +187,6 @@ Item {
197 index = 0;
187 index = 0;
198 }
188 }
199 spreadView.selectedIndex = index;
189 spreadView.selectedIndex = index;
200− root.fullscreen = ApplicationManager.get(index).fullscreen;
201 // If we're not in full spread mode yet, always unwind to start pos
190 // If we're not in full spread mode yet, always unwind to start pos
202 // otherwise unwind up to progress 0 of the selected index
191 // otherwise unwind up to progress 0 of the selected index
203 if (spreadView.phase < 2) {
192 if (spreadView.phase < 2) {
qml/Stages/TabletStage.qml+1−2
@@ -34,8 +34,7 @@ Item {
34 property bool interactive
34 property bool interactive
35
35
36 // State information propagated to the outside
36 // State information propagated to the outside
37− property bool fullscreen: true
38− property bool locked: spreadView.phase == 2
37+ readonly property bool locked: spreadView.phase == 2
39
38
40 QtObject {
39 QtObject {
41 id: priv
40 id: priv