git.iko.soy/unity8
on xenial help sign in
Fixed PhoneStage & ShellWithPin tests
87d6679Nick Dedekind
qml/Stage/Stage.qml+1
compare with xenial
unifiedsplit
@@ -1622,6 +1622,7 @@ FocusScope {
1622 highlightSize: windowInfoItem.iconMargin / 2
1622 highlightSize: windowInfoItem.iconMargin / 2
1623 boundsItem: boundariesForWindowPlacement
1623 boundsItem: boundariesForWindowPlacement
1624 altDragEnabled: root.mode == "windowed"
1624 altDragEnabled: root.mode == "windowed"
1625+ panelState: root.panelState
1625
1626
1626 requestedWidth: appDelegate.requestedWidth
1627 requestedWidth: appDelegate.requestedWidth
1627 requestedHeight: appDelegate.requestedHeight
1628 requestedHeight: appDelegate.requestedHeight
tests/qmltests/Stage/tst_PhoneStage.qml+2
@@ -19,6 +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/Components/PanelState"
22import "../../../qml/Stage"
23import "../../../qml/Stage"
23import Ubuntu.Components 1.3
24import Ubuntu.Components 1.3
24import Unity.Application 0.1
25import Unity.Application 0.1
@@ -55,6 +56,7 @@ Item {
55 Component.onCompleted: {
56 Component.onCompleted: {
56 ApplicationManager.startApplication("unity8-dash");
57 ApplicationManager.startApplication("unity8-dash");
57 }
58 }
59+ panelState: PanelState {}
58 }
60 }
59
61
60 Flickable {
62 Flickable {
tests/qmltests/tst_ShellWithPin.qml+7−13
@@ -41,20 +41,10 @@ Item {
41 }
41 }
42
42
43 QtObject {
43 QtObject {
44− id: applicationArguments
44+ id: _screenWindow
45−
45+ property bool primary: true
46− function hasGeometry() {
47− return false;
48− }
49−
50− function width() {
51− return 0;
52− }
53−
54− function height() {
55− return 0;
56− }
57 }
46 }
47+ property alias screenWindow: _screenWindow
58
48
59 Row {
49 Row {
60 id: contentRow
50 id: contentRow
@@ -73,6 +63,10 @@ Item {
73 Component.onDestruction: {
63 Component.onDestruction: {
74 shellLoader.itemDestroyed = true
64 shellLoader.itemDestroyed = true
75 }
65 }
66+ SurfaceManager {
67+ id: surfaceMan
68+ }
69+ surfaceManager: surfaceMan
76 }
70 }
77 }
71 }
78 }
72 }