git.iko.soy/unity8
on xenial help sign in
beginnings of the side stage
0aa0b21Michael Zanetti
qml/Shell.qml+3−1
compare with xenial
unifiedsplit
@@ -283,7 +283,9 @@ StyledItem {
283 Binding {
283 Binding {
284 target: applicationsDisplayLoader.item
284 target: applicationsDisplayLoader.item
285 property: "mode"
285 property: "mode"
286− value: applicationsDisplayLoader.usageScenario == "phone" ? "staged" : "windowed"
286+ value: applicationsDisplayLoader.usageScenario == "phone" ? "staged"
287+ : applicationsDisplayLoader.usageScenario == "tablet" ? "stagedWithSideStage"
288+ : "windowed"
287 }
289 }
288 Binding {
290 Binding {
289 target: applicationsDisplayLoader.item
291 target: applicationsDisplayLoader.item
qml/Stages/DecoratedWindow.qml+1−1
@@ -144,7 +144,7 @@ FocusScope {
144 transitions: [
144 transitions: [
145 Transition {
145 Transition {
146 from: "*"; to: "*"
146 from: "*"; to: "*"
147− UbuntuNumberAnimation { properties: "width,height,implicitWidth,implicitHeight"; duration: priv.animationDuration }
147+ UbuntuNumberAnimation { properties: "width,height,itemScale,implicitWidth,implicitHeight"; duration: priv.animationDuration }
148 }
148 }
149 ]
149 ]
150
150
qml/Stages/DesktopStage.qml+79−1
@@ -163,6 +163,47 @@ AbstractStage {
163 }
163 }
164 }
164 }
165 }
165 }
166+
167+ property var mainStageDelegate: null
168+ property var sideStageDelegate: null
169+ property int mainStageItemId: 0
170+ property int sideStageItemId: 0
171+ property string mainStageAppId: ""
172+ property string sideStageAppId: ""
173+
174+ function updateMainAndSideStageIndexes() {
175+ var choseMainStage = false;
176+ var choseSideStage = false;
177+
178+ if (!root.topLevelSurfaceList)
179+ return;
180+
181+ for (var i = 0; i < topLevelSurfaceRepeater.count && (!choseMainStage || !choseSideStage); ++i) {
182+ var appDelegate = topLevelSurfaceRepeater.itemAt(i);
183+ if (sideStage.shown && spreadDelegate.stage == ApplicationInfoInterface.SideStage
184+ && !choseSideStage) {
185+ priv.sideStageDelegate = appDelegate
186+ priv.sideStageItemId = root.topLevelSurfaceList.idAt(i);
187+ priv.sideStageAppId = root.topLevelSurfaceList.applicationAt(i).appId;
188+ choseSideStage = true;
189+ } else if (!choseMainStage && spreadDelegate.stage == ApplicationInfoInterface.MainStage) {
190+ priv.mainStageDelegate = appDelegate;
191+ priv.mainStageItemId = root.topLevelSurfaceList.idAt(i);
192+ priv.mainStageAppId = root.topLevelSurfaceList.applicationAt(i).appId;
193+ choseMainStage = true;
194+ }
195+ }
196+ if (!choseMainStage) {
197+ priv.mainStageDelegate = null;
198+ priv.mainStageItemId = 0;
199+ priv.mainStageAppId = "";
200+ }
201+ if (!choseSideStage) {
202+ priv.sideStageDelegate = null;
203+ priv.sideStageItemId = 0;
204+ priv.sideStageAppId = "";
205+ }
206+ }
166 }
207 }
167
208
168 Connections {
209 Connections {
@@ -254,6 +295,9 @@ AbstractStage {
254 State {
295 State {
255 name: "staged"; when: root.mode === "staged"
296 name: "staged"; when: root.mode === "staged"
256 },
297 },
298+ State {
299+ name: "stagedWithSideStage"; when: root.mode === "stagedWithSideStage"
300+ },
257 State {
301 State {
258 name: "windowed"; when: root.mode === "windowed"
302 name: "windowed"; when: root.mode === "windowed"
259 }
303 }
@@ -359,6 +403,8 @@ AbstractStage {
359 property bool visuallyMaximized: false
403 property bool visuallyMaximized: false
360 property bool visuallyMinimized: false
404 property bool visuallyMinimized: false
361
405
406+ property int stage: ApplicationInfoInterface.MainStage
407+
362 readonly property var surface: model.surface
408 readonly property var surface: model.surface
363 readonly property alias resizeArea: resizeArea
409 readonly property alias resizeArea: resizeArea
364
410
@@ -548,6 +594,15 @@ AbstractStage {
548 totalItems: appRepeater.count
594 totalItems: appRepeater.count
549 flickable: floatingFlickable
595 flickable: floatingFlickable
550 }
596 }
597+ StageMaths {
598+ id: stageMaths
599+ sceneWidth: root.width
600+ stage: appDelegate.stage
601+ thisDelegate: appDelegate
602+ mainStageDelegate: priv.mainStageDelegate
603+ sideStageDelegate: priv.sideStageDelegate
604+ }
605+
551 StagedRightEdgeMaths {
606 StagedRightEdgeMaths {
552 id: stagedRightEdgeMaths
607 id: stagedRightEdgeMaths
553 itemIndex: index
608 itemIndex: index
@@ -597,7 +652,7 @@ AbstractStage {
597 }
652 }
598 PropertyChanges {
653 PropertyChanges {
599 target: decoratedWindow;
654 target: decoratedWindow;
600− showDecoration: false
655+ hasDecoration: false
601 requestedWidth: stagedRightEdgeMaths.animatedWidth
656 requestedWidth: stagedRightEdgeMaths.animatedWidth
602 requestedHeight: stagedRightEdgeMaths.animatedHeight - PanelState.panelHeight
657 requestedHeight: stagedRightEdgeMaths.animatedHeight - PanelState.panelHeight
603// width: appContainer.width - root.leftMargin
658// width: appContainer.width - root.leftMargin
@@ -624,6 +679,29 @@ AbstractStage {
624 enabled: false
679 enabled: false
625 }
680 }
626 },
681 },
682+ State {
683+ name: "stagedWithSideStage"; when: root.state == "stagedWithSideStage"
684+ PropertyChanges {
685+ target: stageMaths
686+ itemIndex: index
687+ }
688+ PropertyChanges {
689+ target: appDelegate
690+ x: stageMaths.itemX
691+ y: appDelegate.fullscreen ? 0 : PanelState.panelHeight
692+ requestedWidth: stageMaths.itemWidth
693+ requestedHeight: appContainer.height - PanelState.panelHeight
694+ visuallyMaximized: true
695+ }
696+ PropertyChanges {
697+ target: decoratedWindow
698+ hasDecoration: false
699+ }
700+ PropertyChanges {
701+ target: resizeArea
702+ enabled: false
703+ }
704+ },
627 State {
705 State {
628 name: "maximized"; when: root.state === "windowed" && appDelegate.maximized && !appDelegate.minimized
706 name: "maximized"; when: root.state === "windowed" && appDelegate.maximized && !appDelegate.minimized
629 PropertyChanges {
707 PropertyChanges {
qml/Stages/StageMaths.qmlnew file+24
@@ -0,0 +1,24 @@
1+import QtQuick 2.4
2+import Unity.Application 0.1
3+
4+QtObject {
5+ id: root
6+
7+ // input
8+ property int itemIndex: 0
9+ property int sceneWidth: 0
10+ property int sideStageWidth: units.gu(40)
11+
12+ property int stage: ApplicationInfoInterface.MainStage
13+ property var thisDelegate: null
14+ property var mainStageDelegate: null
15+ property var sideStageDelegate: null
16+
17+ // output
18+ readonly property int itemX: stage == ApplicationInfoInterface.MainStage ? 0 :
19+ stage == ApplicationInfoInterface.SideStage ? sceneWidth - sideStageWidth :
20+ sceneWidth
21+
22+ readonly property int itemWidth: stage == ApplicationInfoInterface.MainStage ? sceneWidth - sideStageWidth :
23+ stage == ApplicationInfoInterface.SideStage ? sideStageWidth : sceneWidth
24+}