git.iko.soy/unity8
on xenial help sign in
some triel to fix orientedshell
84006eeMichael Zanetti
qml/Stage/DecoratedWindow.qml+3−1
compare with xenial
unifiedsplit
@@ -117,10 +117,12 @@ FocusScope {
117
117
118 Rectangle {
118 Rectangle {
119 id: selectionHighlight
119 id: selectionHighlight
120+ objectName: "selectionHighlight"
120 anchors.fill: parent
121 anchors.fill: parent
121 anchors.margins: -root.highlightSize
122 anchors.margins: -root.highlightSize
122 color: "white"
123 color: "white"
123 opacity: showHighlight ? 0.55 : 0
124 opacity: showHighlight ? 0.55 : 0
125+ visible: opacity > 0
124 }
126 }
125
127
126 BorderImage {
128 BorderImage {
@@ -134,7 +136,7 @@ FocusScope {
134
136
135 WindowDecoration {
137 WindowDecoration {
136 id: decoration
138 id: decoration
137− target: root.parent
139+ target: root.parent || null
138 objectName: "appWindowDecoration"
140 objectName: "appWindowDecoration"
139 anchors { left: parent.left; top: parent.top; right: parent.right }
141 anchors { left: parent.left; top: parent.top; right: parent.right }
140 height: units.gu(3)
142 height: units.gu(3)
qml/Stage/WindowDecoration.qml+1−1
@@ -79,7 +79,7 @@ MouseArea {
79 onMaximizeClicked: root.maximizeClicked();
79 onMaximizeClicked: root.maximizeClicked();
80 onMaximizeHorizontallyClicked: if (root.target.canBeMaximizedHorizontally) root.maximizeHorizontallyClicked();
80 onMaximizeHorizontallyClicked: if (root.target.canBeMaximizedHorizontally) root.maximizeHorizontallyClicked();
81 onMaximizeVerticallyClicked: if (root.target.canBeMaximizedVertically) root.maximizeVerticallyClicked();
81 onMaximizeVerticallyClicked: if (root.target.canBeMaximizedVertically) root.maximizeVerticallyClicked();
82− closeButtonShown: root.target.application.appId !== "unity8-dash"
82+ closeButtonShown: root.target.appId !== "unity8-dash"
83 }
83 }
84
84
85 Label {
85 Label {
tests/qmltests/Stage/tst_DecoratedWindow.qml+4−3
@@ -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 Ubuntu.Components.ListItems 1.3 as ListItem
24import Ubuntu.Components.ListItems 1.3 as ListItem
25import Unity.Application 0.1
25import Unity.Application 0.1
@@ -62,6 +62,7 @@ Rectangle {
62
62
63 active: false
63 active: false
64 property bool itemDestroyed: false
64 property bool itemDestroyed: false
65+
65 sourceComponent: DecoratedWindow {
66 sourceComponent: DecoratedWindow {
66 anchors.fill: parent
67 anchors.fill: parent
67 application: fakeApplication
68 application: fakeApplication
@@ -170,7 +171,7 @@ Rectangle {
170 SignalSpy {
171 SignalSpy {
171 id: spyClosedSignal
172 id: spyClosedSignal
172 target: spreadDelegateLoader.item
173 target: spreadDelegateLoader.item
173− signalName: "closed"
174+ signalName: "closeClicked"
174 }
175 }
175
176
176 property var dragArea
177 property var dragArea
@@ -333,7 +334,7 @@ Rectangle {
333 loadWithGalleryApp.clicked();
334 loadWithGalleryApp.clicked();
334 var highlightRect = findChild(spreadDelegateLoader.item, "selectionHighlight")
335 var highlightRect = findChild(spreadDelegateLoader.item, "selectionHighlight")
335 tryCompare(highlightRect, "visible", false)
336 tryCompare(highlightRect, "visible", false)
336− spreadDelegateLoader.item.highlightShown = true;
337+ spreadDelegateLoader.item.showHighlight = true;
337 tryCompare(highlightRect, "visible", true)
338 tryCompare(highlightRect, "visible", true)
338 }
339 }
339 }
340 }
tests/qmltests/tst_OrientedShell.qml+14−17
@@ -443,7 +443,7 @@ Rectangle {
443 SignalSpy { id: signalSpy2 }
443 SignalSpy { id: signalSpy2 }
444
444
445 Connections {
445 Connections {
446− id: spreadRepeaterConnections
446+ id: appRepeaterConnections
447 ignoreUnknownSignals : true
447 ignoreUnknownSignals : true
448 property var itemAddedCallback: null
448 property var itemAddedCallback: null
449 onItemAdded: {
449 onItemAdded: {
@@ -483,8 +483,8 @@ Rectangle {
483 while (keyboardsModel.count > 0)
483 while (keyboardsModel.count > 0)
484 MockInputDeviceBackend.removeDevice("/kbd" + (keyboardsModel.count - 1))
484 MockInputDeviceBackend.removeDevice("/kbd" + (keyboardsModel.count - 1))
485
485
486− spreadRepeaterConnections.target = null;
486+ appRepeaterConnections.target = null;
487− spreadRepeaterConnections.itemAddedCallback = null;
487+ appRepeaterConnections.itemAddedCallback = null;
488 signalSpy.target = null;
488 signalSpy.target = null;
489 signalSpy.signalName = "";
489 signalSpy.signalName = "";
490
490
@@ -896,8 +896,8 @@ Rectangle {
896
896
897 var twitterDelegate = null;
897 var twitterDelegate = null;
898
898
899− verify(spreadRepeaterConnections.target);
899+ verify(appRepeaterConnections.target);
900− spreadRepeaterConnections.itemAddedCallback = function(item) {
900+ appRepeaterConnections.itemAddedCallback = function(item) {
901 verify(item.application.appId, "twitter-webapp");
901 verify(item.application.appId, "twitter-webapp");
902 twitterDelegate = item;
902 twitterDelegate = item;
903 signalSpy.target = findInvisibleChild(item, "orientationChangeAnimation");
903 signalSpy.target = findInvisibleChild(item, "orientationChangeAnimation");
@@ -919,7 +919,7 @@ Rectangle {
919 compare(twitterApp.supportedOrientations, Qt.PortraitOrientation | Qt.LandscapeOrientation
919 compare(twitterApp.supportedOrientations, Qt.PortraitOrientation | Qt.LandscapeOrientation
920 | Qt.InvertedPortraitOrientation | Qt.InvertedLandscapeOrientation);
920 | Qt.InvertedPortraitOrientation | Qt.InvertedLandscapeOrientation);
921
921
922− // Wait until spreadRepeaterConnections hs caught the new SpreadDelegate and
922+ // Wait until appRepeaterConnections hs caught the new SpreadDelegate and
923 // set up the signalSpy target accordingly.
923 // set up the signalSpy target accordingly.
924 tryCompareFunction(function(){ return signalSpy.target != null && signalSpy.valid; }, true);
924 tryCompareFunction(function(){ return signalSpy.target != null && signalSpy.valid; }, true);
925
925
@@ -943,8 +943,8 @@ Rectangle {
943 loadShell(data.deviceName);
943 loadShell(data.deviceName);
944
944
945 var dialerDelegate = null;
945 var dialerDelegate = null;
946− verify(spreadRepeaterConnections.target);
946+ verify(appRepeaterConnections.target);
947− spreadRepeaterConnections.itemAddedCallback = function(item) {
947+ appRepeaterConnections.itemAddedCallback = function(item) {
948 dialerDelegate = item;
948 dialerDelegate = item;
949 verify(item.application.appId, "dialer-app");
949 verify(item.application.appId, "dialer-app");
950 }
950 }
@@ -990,8 +990,8 @@ Rectangle {
990 ////
990 ////
991 // Launch dialer
991 // Launch dialer
992 var dialerDelegate = null;
992 var dialerDelegate = null;
993− verify(spreadRepeaterConnections.target);
993+ verify(appRepeaterConnections.target);
994− spreadRepeaterConnections.itemAddedCallback = function(item) {
994+ appRepeaterConnections.itemAddedCallback = function(item) {
995 dialerDelegate = item;
995 dialerDelegate = item;
996 verify(item.application.appId, "dialer-app");
996 verify(item.application.appId, "dialer-app");
997 }
997 }
@@ -1011,7 +1011,7 @@ Rectangle {
1011 ////
1011 ////
1012 // Launch twitter
1012 // Launch twitter
1013 var twitterDelegate = null;
1013 var twitterDelegate = null;
1014− spreadRepeaterConnections.itemAddedCallback = function(item) {
1014+ appRepeaterConnections.itemAddedCallback = function(item) {
1015 twitterDelegate = item;
1015 twitterDelegate = item;
1016 verify(item.application.appId, "twitter-webapp");
1016 verify(item.application.appId, "twitter-webapp");
1017 }
1017 }
@@ -1606,9 +1606,6 @@ Rectangle {
1606 topLevelSurfaceList = findInvisibleChild(shell, "topLevelSurfaceList");
1606 topLevelSurfaceList = findInvisibleChild(shell, "topLevelSurfaceList");
1607 verify(topLevelSurfaceList);
1607 verify(topLevelSurfaceList);
1608
1608
1609− var stageLoader = findChild(shell, "applicationsDisplayLoader");
1610− verify(stageLoader);
1611−
1612 tryCompare(shell, "waitingOnGreeter", false); // reset by greeter when ready
1609 tryCompare(shell, "waitingOnGreeter", false); // reset by greeter when ready
1613
1610
1614 waitUntilShellIsInOrientation(root.physicalOrientation0);
1611 waitUntilShellIsInOrientation(root.physicalOrientation0);
@@ -1617,9 +1614,9 @@ Rectangle {
1617
1614
1618 swipeAwayGreeter();
1615 swipeAwayGreeter();
1619
1616
1620− var spreadRepeater = findChild(stageLoader, "spreadRepeater");
1617+ var appRepeater = findChild(shell, "appRepeater");
1621− if (spreadRepeater) {
1618+ if (appRepeater) {
1622− spreadRepeaterConnections.target = spreadRepeater;
1619+ appRepeaterConnections.target = appRepeater;
1623 }
1620 }
1624 }
1621 }
1625
1622