git.iko.soy/unity8
on xenial help sign in
fix tablet stage app visiblitiy
97d3699Michael Zanetti
qml/Stage/Stage.qml+1
compare with xenial
unifiedsplit
@@ -1097,6 +1097,7 @@ AbstractStage {
1097 requestedWidth: stageMaths.itemWidth
1097 requestedWidth: stageMaths.itemWidth
1098 requestedHeight: appDelegate.fullscreen ? appContainer.height : appContainer.height - PanelState.panelHeight
1098 requestedHeight: appDelegate.fullscreen ? appContainer.height : appContainer.height - PanelState.panelHeight
1099 visuallyMaximized: true
1099 visuallyMaximized: true
1100+ visible: appDelegate.x < root.width
1100 }
1101 }
1101 PropertyChanges {
1102 PropertyChanges {
1102 target: decoratedWindow
1103 target: decoratedWindow
tests/qmltests/CMakeLists.txt+1−1
@@ -88,7 +88,7 @@ add_unity8_qmltest(Panel/Indicators MenuItemFactory)
88add_unity8_qmltest(Panel/Indicators MessageMenuItemFactory)
88add_unity8_qmltest(Panel/Indicators MessageMenuItemFactory)
89add_unity8_qmltest(Stage ApplicationWindow)
89add_unity8_qmltest(Stage ApplicationWindow)
90add_unity8_qmltest(Stage DesktopStage)
90add_unity8_qmltest(Stage DesktopStage)
91−add_unity8_qmltest(Stages PhoneStage)
91+add_unity8_qmltest(Stage PhoneStage)
92add_unity8_qmltest(Stages SpreadDelegate)
92add_unity8_qmltest(Stages SpreadDelegate)
93add_unity8_qmltest(Stages SurfaceContainer)
93add_unity8_qmltest(Stages SurfaceContainer)
94add_unity8_qmltest(Stages TabletStage)
94add_unity8_qmltest(Stages TabletStage)
tests/qmltests/Stage/tst_PhoneStage.qml+4−5
@@ -19,7 +19,7 @@ import QtTest 1.0
19import Unity.Test 0.1 as UT
19import Unity.Test 0.1 as UT
20import ".."
20import ".."
21import "../../../qml/Components"
21import "../../../qml/Components"
22−import "../../../qml/Stages"
22+import "../../../qml/Stage"
23import Ubuntu.Components 1.3
23import Ubuntu.Components 1.3
24import Unity.Application 0.1
24import Unity.Application 0.1
25import WindowManager 0.1
25import WindowManager 0.1
@@ -31,7 +31,7 @@ Item {
31
31
32 property var greeter: { fullyShown: true }
32 property var greeter: { fullyShown: true }
33
33
34− PhoneStage {
34+ Stage {
35 id: phoneStage
35 id: phoneStage
36 anchors { fill: parent; rightMargin: units.gu(30) }
36 anchors { fill: parent; rightMargin: units.gu(30) }
37 focus: true
37 focus: true
@@ -41,6 +41,7 @@ Item {
41 shellOrientation: Qt.PortraitOrientation
41 shellOrientation: Qt.PortraitOrientation
42 orientations: Orientations {}
42 orientations: Orientations {}
43 applicationManager: ApplicationManager
43 applicationManager: ApplicationManager
44+ mode: "staged"
44 topLevelSurfaceList: TopLevelSurfaceList {
45 topLevelSurfaceList: TopLevelSurfaceList {
45 id: topLevelSurfaceList
46 id: topLevelSurfaceList
46 applicationsModel: ApplicationManager
47 applicationsModel: ApplicationManager
@@ -85,7 +86,7 @@ Item {
85 when: windowShown
86 when: windowShown
86
87
87 function findAppWindowForSurfaceId(surfaceId) {
88 function findAppWindowForSurfaceId(surfaceId) {
88− var delegateObjectName = "spreadDelegate_" + surfaceId;
89+ var delegateObjectName = "appDelegate_" + surfaceId;
89 var spreadDelegate = findChild(phoneStage, delegateObjectName);
90 var spreadDelegate = findChild(phoneStage, delegateObjectName);
90 if (!spreadDelegate) {
91 if (!spreadDelegate) {
91 console.warn("Failed to find " + delegateObjectName + " in phoneStage ("+phoneStage+")");
92 console.warn("Failed to find " + delegateObjectName + " in phoneStage ("+phoneStage+")");
@@ -111,8 +112,6 @@ Item {
111 var appSurfaceId = topLevelSurfaceList.nextId;
112 var appSurfaceId = topLevelSurfaceList.nextId;
112 var app = ApplicationManager.startApplication(ApplicationManager.availableApplications[ApplicationManager.count])
113 var app = ApplicationManager.startApplication(ApplicationManager.availableApplications[ApplicationManager.count])
113 tryCompare(app, "state", ApplicationInfoInterface.Running)
114 tryCompare(app, "state", ApplicationInfoInterface.Running)
114− var spreadView = findChild(phoneStage, "spreadView");
115− tryCompare(spreadView, "contentX", -spreadView.shift);
116 waitUntilAppSurfaceShowsUp(appSurfaceId);
115 waitUntilAppSurfaceShowsUp(appSurfaceId);
117 waitForRendering(phoneStage)
116 waitForRendering(phoneStage)
118 }
117 }