on xenial help sign in
mark locked property in stages readonly, drop unused fullscreen property
commitc52790629e009aa473cf4f42dc0d57afaba0d9fc authorMichael Zanetti <michael.zanetti@canonical.com> dateFri 18 Jul 2014, 18:18 (12 years ago) parent7621d20
2 files changed+2−14
qml/Stages/PhoneStage.qml+1−12 qml/Stages/TabletStage.qml+1−2
qml/Stages/PhoneStage.qml+1−12
@@ -30,8 +30,7 @@ Item {
3030 property bool interactive
3131
3232 // 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
3534
3635 function select(appId) {
3736 spreadView.snapTo(priv.indexOf(appId))
@@ -54,14 +53,6 @@ Item {
5453 }
5554 }
5655
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−
6556 onApplicationAdded: {
6657 if (spreadView.phase == 2) {
6758 spreadView.snapTo(ApplicationManager.count - 1);
@@ -90,7 +81,6 @@ Item {
9081
9182 function switchToApp(appId) {
9283 if (priv.focusedAppId) {
93− root.fullscreen = ApplicationManager.findApplication(appId).fullscreen;
9484 spreadView.focusChanging = true
9585 ApplicationManager.focusApplication(appId);
9686 } else {
@@ -197,7 +187,6 @@ Item {
197187 index = 0;
198188 }
199189 spreadView.selectedIndex = index;
200− root.fullscreen = ApplicationManager.get(index).fullscreen;
201190 // If we're not in full spread mode yet, always unwind to start pos
202191 // otherwise unwind up to progress 0 of the selected index
203192 if (spreadView.phase < 2) {
qml/Stages/TabletStage.qml+1−2
@@ -34,8 +34,7 @@ Item {
3434 property bool interactive
3535
3636 // 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
3938
4039 QtObject {
4140 id: priv