Fixed PhoneStage & ShellWithPin tests
commit87d6679ddee93008b74cf8b313c17586a046afc0
authorNick Dedekind <nick.dedekind@canonical.com>
dateTue 28 Mar 2017, 18:03 (10 years ago)
parente88688e
qml/Stage/Stage.qml+1
@@ -1622,6 +1622,7 @@ FocusScope {
16221622 highlightSize: windowInfoItem.iconMargin / 2
16231623 boundsItem: boundariesForWindowPlacement
16241624 altDragEnabled: root.mode == "windowed"
1625+ panelState: root.panelState
16251626
16261627 requestedWidth: appDelegate.requestedWidth
16271628 requestedHeight: appDelegate.requestedHeight
tests/qmltests/Stage/tst_PhoneStage.qml+2
@@ -19,6 +19,7 @@ import QtTest 1.0
1919import Unity.Test 0.1 as UT
2020import ".."
2121import "../../../qml/Components"
22+import "../../../qml/Components/PanelState"
2223import "../../../qml/Stage"
2324import Ubuntu.Components 1.3
2425import Unity.Application 0.1
@@ -55,6 +56,7 @@ Item {
5556 Component.onCompleted: {
5657 ApplicationManager.startApplication("unity8-dash");
5758 }
59+ panelState: PanelState {}
5860 }
5961
6062 Flickable {
tests/qmltests/tst_ShellWithPin.qml+7−13
@@ -41,20 +41,10 @@ Item {
4141 }
4242
4343 QtObject {
44− id: applicationArguments
45−
46− function hasGeometry() {
47− return false;
48− }
49−
50− function width() {
51− return 0;
52− }
53−
54− function height() {
55− return 0;
56− }
44+ id: _screenWindow
45+ property bool primary: true
5746 }
47+ property alias screenWindow: _screenWindow
5848
5949 Row {
6050 id: contentRow
@@ -73,6 +63,10 @@ Item {
7363 Component.onDestruction: {
7464 shellLoader.itemDestroyed = true
7565 }
66+ SurfaceManager {
67+ id: surfaceMan
68+ }
69+ surfaceManager: surfaceMan
7670 }
7771 }
7872 }