git.iko.soy/unity8
on xenial help sign in
reintroduce a way to determine if the sidestage is enabled
bcc1ff9Michael Zanetti
qml/Shell.qml+4−6
compare with xenial
unifiedsplit
@@ -50,6 +50,8 @@ FocusScope {
50
50
51 property bool dashShown: dash.shown
51 property bool dashShown: dash.shown
52
52
53+ property bool sideStageEnabled: shell.width >= units.gu(60)
54+
53 function activateApplication(appId) {
55 function activateApplication(appId) {
54 if (ApplicationManager.findApplication(appId)) {
56 if (ApplicationManager.findApplication(appId)) {
55 print("Shell.qml: activating app", appId);
57 print("Shell.qml: activating app", appId);
@@ -57,10 +59,7 @@ FocusScope {
57 } else {
59 } else {
58 print("starting app", appId);
60 print("starting app", appId);
59
61
60− // FIXME:
61−// var execFlags = sideStageEnabled ? ApplicationManager.NoFlag : ApplicationManager.ForceMainStage;
62+ var execFlags = shell.sideStageEnabled ? ApplicationManager.NoFlag : ApplicationManager.ForceMainStage;
62− var execFlags = ApplicationManager.ForceMainStage;
63−
64 ApplicationManager.startApplication(appId, execFlags);
63 ApplicationManager.startApplication(appId, execFlags);
65 }
64 }
66 }
65 }
@@ -242,8 +241,7 @@ FocusScope {
242 id: applicationsDisplayLoader
241 id: applicationsDisplayLoader
243 anchors.fill: parent
242 anchors.fill: parent
244
243
245−// source: "Stages/StageWithSideStage.qml"
244+ source: shell.sideStageEnabled ? "Stages/StageWithSideStage.qml" : "Stages/PhoneStage.qml"
246− source: "Stages/PhoneStage.qml"
247
245
248 Binding {
246 Binding {
249 target: applicationsDisplayLoader.item
247 target: applicationsDisplayLoader.item