84006ee · unity8 · git.iko.soy

git.iko.soy/unity8

some triel to fix orientedshell

commit84006ee7d3fff449554e3ae8d3fe5616f1df52e0 authorMichael Zanetti <michael.zanetti@canonical.com> dateMon 19 Sep 2016, 11:24 (10 years ago) parentd821326

4 files changed+22−22

compare with xenial

unifiedsplit

qml/Stage/DecoratedWindow.qml+3−1 qml/Stage/WindowDecoration.qml+1−1 tests/qmltests/Stage/tst_DecoratedWindow.qml+4−3 tests/qmltests/tst_OrientedShell.qml+14−17

qml/Stage/DecoratedWindow.qml+3−1

@@ -117,10 +117,12 @@ FocusScope {

117117

118118 Rectangle {

119119 id: selectionHighlight

120+ objectName: "selectionHighlight"

120121 anchors.fill: parent

121122 anchors.margins: -root.highlightSize

122123 color: "white"

123124 opacity: showHighlight ? 0.55 : 0

125+ visible: opacity > 0

124126 }

125127

126128 BorderImage {

@@ -134,7 +136,7 @@ FocusScope {

134136

135137 WindowDecoration {

136138 id: decoration

137− target: root.parent

139+ target: root.parent || null

138140 objectName: "appWindowDecoration"

139141 anchors { left: parent.left; top: parent.top; right: parent.right }

140142 height: units.gu(3)

qml/Stage/WindowDecoration.qml+1−1

@@ -79,7 +79,7 @@ MouseArea {

7979 onMaximizeClicked: root.maximizeClicked();

8080 onMaximizeHorizontallyClicked: if (root.target.canBeMaximizedHorizontally) root.maximizeHorizontallyClicked();

8181 onMaximizeVerticallyClicked: if (root.target.canBeMaximizedVertically) root.maximizeVerticallyClicked();

82− closeButtonShown: root.target.application.appId !== "unity8-dash"

82+ closeButtonShown: root.target.appId !== "unity8-dash"

8383 }

8484

8585 Label {

tests/qmltests/Stage/tst_DecoratedWindow.qml+4−3

@@ -19,7 +19,7 @@ import QtTest 1.0

1919import Unity.Test 0.1 as UT

2020import ".."

2121import "../../../qml/Components"

22−import "../../../qml/Stages"

22+import "../../../qml/Stage"

2323import Ubuntu.Components 1.3

2424import Ubuntu.Components.ListItems 1.3 as ListItem

2525import Unity.Application 0.1

@@ -62,6 +62,7 @@ Rectangle {

6262

6363 active: false

6464 property bool itemDestroyed: false

65+

6566 sourceComponent: DecoratedWindow {

6667 anchors.fill: parent

6768 application: fakeApplication

@@ -170,7 +171,7 @@ Rectangle {

170171 SignalSpy {

171172 id: spyClosedSignal

172173 target: spreadDelegateLoader.item

173− signalName: "closed"

174+ signalName: "closeClicked"

174175 }

175176

176177 property var dragArea

@@ -333,7 +334,7 @@ Rectangle {

333334 loadWithGalleryApp.clicked();

334335 var highlightRect = findChild(spreadDelegateLoader.item, "selectionHighlight")

335336 tryCompare(highlightRect, "visible", false)

336− spreadDelegateLoader.item.highlightShown = true;

337+ spreadDelegateLoader.item.showHighlight = true;

337338 tryCompare(highlightRect, "visible", true)

338339 }

339340 }

tests/qmltests/tst_OrientedShell.qml+14−17

@@ -443,7 +443,7 @@ Rectangle {

443443 SignalSpy { id: signalSpy2 }

444444

445445 Connections {

446− id: spreadRepeaterConnections

446+ id: appRepeaterConnections

447447 ignoreUnknownSignals : true

448448 property var itemAddedCallback: null

449449 onItemAdded: {

@@ -483,8 +483,8 @@ Rectangle {

483483 while (keyboardsModel.count > 0)

484484 MockInputDeviceBackend.removeDevice("/kbd" + (keyboardsModel.count - 1))

485485

486− spreadRepeaterConnections.target = null;

487− spreadRepeaterConnections.itemAddedCallback = null;

486+ appRepeaterConnections.target = null;

487+ appRepeaterConnections.itemAddedCallback = null;

488488 signalSpy.target = null;

489489 signalSpy.signalName = "";

490490

@@ -896,8 +896,8 @@ Rectangle {

896896

897897 var twitterDelegate = null;

898898

899− verify(spreadRepeaterConnections.target);

900− spreadRepeaterConnections.itemAddedCallback = function(item) {

899+ verify(appRepeaterConnections.target);

900+ appRepeaterConnections.itemAddedCallback = function(item) {

901901 verify(item.application.appId, "twitter-webapp");

902902 twitterDelegate = item;

903903 signalSpy.target = findInvisibleChild(item, "orientationChangeAnimation");

@@ -919,7 +919,7 @@ Rectangle {

919919 compare(twitterApp.supportedOrientations, Qt.PortraitOrientation | Qt.LandscapeOrientation

920920 | Qt.InvertedPortraitOrientation | Qt.InvertedLandscapeOrientation);

921921

922− // Wait until spreadRepeaterConnections hs caught the new SpreadDelegate and

922+ // Wait until appRepeaterConnections hs caught the new SpreadDelegate and

923923 // set up the signalSpy target accordingly.

924924 tryCompareFunction(function(){ return signalSpy.target != null && signalSpy.valid; }, true);

925925

@@ -943,8 +943,8 @@ Rectangle {

943943 loadShell(data.deviceName);

944944

945945 var dialerDelegate = null;

946− verify(spreadRepeaterConnections.target);

947− spreadRepeaterConnections.itemAddedCallback = function(item) {

946+ verify(appRepeaterConnections.target);

947+ appRepeaterConnections.itemAddedCallback = function(item) {

948948 dialerDelegate = item;

949949 verify(item.application.appId, "dialer-app");

950950 }

@@ -990,8 +990,8 @@ Rectangle {

990990 ////

991991 // Launch dialer

992992 var dialerDelegate = null;

993− verify(spreadRepeaterConnections.target);

994− spreadRepeaterConnections.itemAddedCallback = function(item) {

993+ verify(appRepeaterConnections.target);

994+ appRepeaterConnections.itemAddedCallback = function(item) {

995995 dialerDelegate = item;

996996 verify(item.application.appId, "dialer-app");

997997 }

@@ -1011,7 +1011,7 @@ Rectangle {

10111011 ////

10121012 // Launch twitter

10131013 var twitterDelegate = null;

1014− spreadRepeaterConnections.itemAddedCallback = function(item) {

1014+ appRepeaterConnections.itemAddedCallback = function(item) {

10151015 twitterDelegate = item;

10161016 verify(item.application.appId, "twitter-webapp");

10171017 }

@@ -1606,9 +1606,6 @@ Rectangle {

16061606 topLevelSurfaceList = findInvisibleChild(shell, "topLevelSurfaceList");

16071607 verify(topLevelSurfaceList);

16081608

1609− var stageLoader = findChild(shell, "applicationsDisplayLoader");

1610− verify(stageLoader);

1611−

16121609 tryCompare(shell, "waitingOnGreeter", false); // reset by greeter when ready

16131610

16141611 waitUntilShellIsInOrientation(root.physicalOrientation0);

@@ -1617,9 +1614,9 @@ Rectangle {

16171614

16181615 swipeAwayGreeter();

16191616

1620− var spreadRepeater = findChild(stageLoader, "spreadRepeater");

1621− if (spreadRepeater) {

1622− spreadRepeaterConnections.target = spreadRepeater;

1617+ var appRepeater = findChild(shell, "appRepeater");

1618+ if (appRepeater) {

1619+ appRepeaterConnections.target = appRepeater;

16231620 }

16241621 }

16251622