on xenial help sign in
drop tons of debug prints
3846937Michael Zanetti
qml/Stage/FakeMaximizeDelegate.qml−2
@@ -38,7 +38,6 @@ Rectangle {
38
38
39 readonly property real hintThreshold: 0.1
39 readonly property real hintThreshold: 0.1
40
40
41− onEdgeChanged: print("***********+ edge changed", edge)
42 // Edge push progress
41 // Edge push progress
43 // Value range is [0.0, 1.0]
42 // Value range is [0.0, 1.0]
44 readonly property real progress: priv.directProgress != -1 ? priv.directProgress : priv.accumulatedProgress
43 readonly property real progress: priv.directProgress != -1 ? priv.directProgress : priv.accumulatedProgress
@@ -97,7 +96,6 @@ Rectangle {
97 }
96 }
98
97
99 function commit() {
98 function commit() {
100− print("comitting!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
101 if (progress > hintThreshold && edge != -1) {
99 if (progress > hintThreshold && edge != -1) {
102 if (edge == Item.Top) {
100 if (edge == Item.Top) {
103 target.maximize();
101 target.maximize();
qml/Stage/PromptSurfaceAnimations.qml−1
@@ -22,7 +22,6 @@ StateGroup {
22 property var container
22 property var container
23 property var surfaceItem
23 property var surfaceItem
24
24
25− onStateChanged: print("++++++++++++++++++++++++ surface animation state change", state)
26 states: [
25 states: [
27 State {
26 State {
28 name: "blank"
27 name: "blank"
qml/Stage/Spread/Spread.qml−11
@@ -101,18 +101,7 @@ Item {
101 Behavior on opacity { UbuntuNumberAnimation { } }
101 Behavior on opacity { UbuntuNumberAnimation { } }
102 }
102 }
103
103
104−// Label {
105−// anchors { left: parent.left; top: parent.top; margins: units.gu(4) }
106−// text: "spreadWidth: " + spreadWidth
107−// + "\n spreadItemWidth: " + spreadItemWidth
108−// + "\n flickableContentWidth: " + spreadTotalWidth
109−// + "\n visibleItemCount: " + visibleItemCount
110−// + "\n contentTopMargin: " + contentTopMargin
111−// }
112−
113−
114 Keys.onPressed: {
104 Keys.onPressed: {
115− print("key pressed")
116 switch (event.key) {
105 switch (event.key) {
117 case Qt.Key_Left:
106 case Qt.Key_Left:
118 case Qt.Key_Backtab:
107 case Qt.Key_Backtab:
qml/Stage/Spread/SpreadDelegateInputArea.qml−4
@@ -51,7 +51,6 @@ Item {
51 for (var i = 0; i < dragEvents.length; i++) {
51 for (var i = 0; i < dragEvents.length; i++) {
52 totalSpeed += dragEvents[i][3]
52 totalSpeed += dragEvents[i][3]
53 }
53 }
54− print("total speed", totalSpeed)
55
54
56 if (zeroVelocityCounts || Math.abs(totalSpeed) > 0.001) {
55 if (zeroVelocityCounts || Math.abs(totalSpeed) > 0.001) {
57 dragVelocity = totalSpeed / dragEvents.length * 1000
56 dragVelocity = totalSpeed / dragEvents.length * 1000
@@ -105,11 +104,9 @@ Item {
105
104
106 d.distance = tp.y - tp.startY - offset
105 d.distance = tp.y - tp.startY - offset
107 d.pushDragEvent(tp);
106 d.pushDragEvent(tp);
108− print("pushed event", tp.y, "velocity is now", d.dragVelocity)
109 }
107 }
110
108
111 onReleased: {
109 onReleased: {
112− print("released", d.moving)
113 if (!d.moving) {
110 if (!d.moving) {
114 root.clicked()
111 root.clicked()
115 }
112 }
@@ -121,7 +118,6 @@ Item {
121
118
122 var touchPoint = touchPoints[0];
119 var touchPoint = touchPoints[0];
123
120
124− print("released velocity is", d.dragVelocity, "min velocity", root.minSpeedToClose)
125 if ((d.dragVelocity < -root.minSpeedToClose && d.distance < -units.gu(8)) || d.distance < -root.height / 2) {
121 if ((d.dragVelocity < -root.minSpeedToClose && d.distance < -units.gu(8)) || d.distance < -root.height / 2) {
126 animation.animate("up")
122 animation.animate("up")
127 } else if ((d.dragVelocity > root.minSpeedToClose && d.distance > units.gu(8)) || d.distance > root.height / 2) {
123 } else if ((d.dragVelocity > root.minSpeedToClose && d.distance > units.gu(8)) || d.distance > root.height / 2) {
qml/Stage/Spread/StagedRightEdgeMaths.qml−2
@@ -131,8 +131,6 @@ QtObject {
131 startScale = root.startScale;
131 startScale = root.startScale;
132 }
132 }
133
133
134−// print("main stage delegate:", priv.mainStageDelegate, "side delegate", priv.sideStageDelegate, "this", appDelegate, "scale:", startScale)
135−// return startScale;
136 if (itemIndex == nextInStack) {
134 if (itemIndex == nextInStack) {
137 return MathUtils.linearAnimation(0, 1, startScale, targetScale, progress)
135 return MathUtils.linearAnimation(0, 1, startScale, targetScale, progress)
138 }
136 }
qml/Stage/Stage.qml−30
@@ -179,7 +179,6 @@ AbstractStage {
179 for (var i = 0; i < appRepeater.count; i++) {
179 for (var i = 0; i < appRepeater.count; i++) {
180 var appDelegate = appRepeater.itemAt(i);
180 var appDelegate = appRepeater.itemAt(i);
181 if (appDelegate && !appDelegate.minimized) {
181 if (appDelegate && !appDelegate.minimized) {
182− print("***** focusing because of focusNext() call", appDelegate.application.appId)
183 appDelegate.focus = true;
182 appDelegate.focus = true;
184 return;
183 return;
185 }
184 }
@@ -402,9 +401,7 @@ AbstractStage {
402 SequentialAnimation {
401 SequentialAnimation {
403 ScriptAction {
402 ScriptAction {
404 script: {
403 script: {
405− print("hightedIndex is:", spreadItem.highlightedIndex)
406 var item = appRepeater.itemAt(Math.max(0, spreadItem.highlightedIndex));
404 var item = appRepeater.itemAt(Math.max(0, spreadItem.highlightedIndex));
407− print("playing focus animation 3 on item", spreadItem.highlightedIndex, item.application.appId)
408
405
409 item.playFocusAnimation();
406 item.playFocusAnimation();
410 if (item.stage == ApplicationInfoInterface.SideStage && !sideStage.shown) {
407 if (item.stage == ApplicationInfoInterface.SideStage && !sideStage.shown) {
@@ -475,7 +472,6 @@ AbstractStage {
475 enabled: sideStage.enabled
472 enabled: sideStage.enabled
476
473
477 onDropped: {
474 onDropped: {
478− print("dropped on main stage drop area")
479 drop.source.appDelegate.saveStage(ApplicationInfoInterface.MainStage);
475 drop.source.appDelegate.saveStage(ApplicationInfoInterface.MainStage);
480 drop.source.appDelegate.focus = true;
476 drop.source.appDelegate.focus = true;
481 }
477 }
@@ -526,7 +522,6 @@ AbstractStage {
526 onDropped: {
522 onDropped: {
527 if (drop.keys == "MainStage") {
523 if (drop.keys == "MainStage") {
528 drop.source.appDelegate.saveStage(ApplicationInfoInterface.SideStage);
524 drop.source.appDelegate.saveStage(ApplicationInfoInterface.SideStage);
529− print("dropped on mainstage")
530 drop.source.appDelegate.focus = true;
525 drop.source.appDelegate.focus = true;
531 }
526 }
532 }
527 }
@@ -676,7 +671,6 @@ AbstractStage {
676 readonly property alias clientAreaItem: decoratedWindow.clientAreaItem
671 readonly property alias clientAreaItem: decoratedWindow.clientAreaItem
677
672
678 function claimFocus() {
673 function claimFocus() {
679− print("(claimfocus) focusing app", priv.sideStageDelegate, appDelegate, sideStage.shown)
680 if (root.state == "spread") {
674 if (root.state == "spread") {
681 priv.goneToSpread = false;
675 priv.goneToSpread = false;
682 }
676 }
@@ -695,7 +689,6 @@ AbstractStage {
695 onFocusRequested: {
689 onFocusRequested: {
696 // Reset spread selection in case there is any
690 // Reset spread selection in case there is any
697 spreadItem.highlightedIndex = -1
691 spreadItem.highlightedIndex = -1
698− print("claiming focus 3")
699 claimFocus();
692 claimFocus();
700 }
693 }
701 }
694 }
@@ -705,7 +698,6 @@ AbstractStage {
705 if (!model.surface) {
698 if (!model.surface) {
706 // when an app has no surfaces, we assume there's only one entry representing it:
699 // when an app has no surfaces, we assume there's only one entry representing it:
707 // this delegate.
700 // this delegate.
708− print("claiming focus 4")
709 claimFocus();
701 claimFocus();
710 } else {
702 } else {
711 // if the application has surfaces, focus request should be at surface-level.
703 // if the application has surfaces, focus request should be at surface-level.
@@ -738,7 +730,6 @@ AbstractStage {
738 if (!appRepeater.startingUp) {
730 if (!appRepeater.startingUp) {
739 // a top level window is always the focused one when it first appears, unfocusing
731 // a top level window is always the focused one when it first appears, unfocusing
740 // any preexisting one
732 // any preexisting one
741− print("focusing because of creation")
742 focus = true;
733 focus = true;
743 }
734 }
744
735
@@ -760,7 +751,6 @@ AbstractStage {
760 for (var i = 0; i < appRepeater.count; i++) {
751 for (var i = 0; i < appRepeater.count; i++) {
761 var appDelegate = appRepeater.itemAt(i);
752 var appDelegate = appRepeater.itemAt(i);
762 if (appDelegate && !appDelegate.minimized && i != index) {
753 if (appDelegate && !appDelegate.minimized && i != index) {
763− print("focusing some other because of destruction")
764 appDelegate.focus = true;
754 appDelegate.focus = true;
765 return;
755 return;
766 }
756 }
@@ -837,24 +827,20 @@ AbstractStage {
837 animationsEnabled = (animated === undefined) || animated;
827 animationsEnabled = (animated === undefined) || animated;
838 windowState = state || WindowStateStorage.WindowStateRestored;
828 windowState = state || WindowStateStorage.WindowStateRestored;
839 windowState &= ~WindowStateStorage.WindowStateMinimized; // clear the minimized bit
829 windowState &= ~WindowStateStorage.WindowStateMinimized; // clear the minimized bit
840− print("***** focusing because of window restore", model.application.appId)
841 focus = true;
830 focus = true;
842 }
831 }
843
832
844 function playFocusAnimation() {
833 function playFocusAnimation() {
845− print("playing focus animation", state, root.mode, "app", model.application.appId)
846 if (state == "stagedRightEdge") {
834 if (state == "stagedRightEdge") {
847 // TODO: Can we drop this if and find something that always works?
835 // TODO: Can we drop this if and find something that always works?
848 if (root.mode == "staged") {
836 if (root.mode == "staged") {
849 rightEdgeFocusAnimation.targetX = 0
837 rightEdgeFocusAnimation.targetX = 0
850− print("doing it to 0")
851 rightEdgeFocusAnimation.start()
838 rightEdgeFocusAnimation.start()
852 } else if (root.mode == "stagedWithSideStage") {
839 } else if (root.mode == "stagedWithSideStage") {
853 rightEdgeFocusAnimation.targetX = appDelegate.stage == ApplicationInfoInterface.SideStage ? sideStage.x : 0
840 rightEdgeFocusAnimation.targetX = appDelegate.stage == ApplicationInfoInterface.SideStage ? sideStage.x : 0
854 rightEdgeFocusAnimation.start()
841 rightEdgeFocusAnimation.start()
855 }
842 }
856 } else if (state == "windowedRightEdge" || root.mode == "windowed") {
843 } else if (state == "windowedRightEdge" || root.mode == "windowed") {
857− print("claiming focus 1")
858 claimFocus();
844 claimFocus();
859 } else {
845 } else {
860 focusAnimation.start()
846 focusAnimation.start()
@@ -893,29 +879,24 @@ AbstractStage {
893 to: 1
879 to: 1
894 duration: UbuntuAnimation.SnapDuration
880 duration: UbuntuAnimation.SnapDuration
895 onStarted: {
881 onStarted: {
896− print("starting focusanimation for", model.application.appId)
897 topLevelSurfaceList.raiseId(model.id);
882 topLevelSurfaceList.raiseId(model.id);
898 }
883 }
899 onStopped: {
884 onStopped: {
900− print("focusing because of normal focus animation finishing")
901 appDelegate.focus = true
885 appDelegate.focus = true
902 }
886 }
903 }
887 }
904 ParallelAnimation {
888 ParallelAnimation {
905 id: rightEdgeFocusAnimation
889 id: rightEdgeFocusAnimation
906 property int targetX: 0
890 property int targetX: 0
907− onStarted: print("starting rightedgefocusanimation for", model.application.appId)
908 UbuntuNumberAnimation { target: appDelegate; properties: "x"; to: rightEdgeFocusAnimation.targetX; duration: priv.animationDuration }
891 UbuntuNumberAnimation { target: appDelegate; properties: "x"; to: rightEdgeFocusAnimation.targetX; duration: priv.animationDuration }
909 UbuntuNumberAnimation { target: decoratedWindow; properties: "angle"; to: 0; duration: priv.animationDuration }
892 UbuntuNumberAnimation { target: decoratedWindow; properties: "angle"; to: 0; duration: priv.animationDuration }
910 UbuntuNumberAnimation { target: decoratedWindow; properties: "itemScale"; to: 1; duration: priv.animationDuration }
893 UbuntuNumberAnimation { target: decoratedWindow; properties: "itemScale"; to: 1; duration: priv.animationDuration }
911 onStopped: {
894 onStopped: {
912− print("focusing", model.application.appId, "because of right edge focus animation completion");
913 appDelegate.focus = true
895 appDelegate.focus = true
914 }
896 }
915 }
897 }
916 ParallelAnimation {
898 ParallelAnimation {
917 id: hidingAnimation
899 id: hidingAnimation
918− onStarted: print("starting hiding animation for", model.application.appId)
919 UbuntuNumberAnimation { target: appDelegate; property: "opacity"; to: 0; duration: priv.animationDuration }
900 UbuntuNumberAnimation { target: appDelegate; property: "opacity"; to: 0; duration: priv.animationDuration }
920 onStopped: appDelegate.opacity = 1
901 onStopped: appDelegate.opacity = 1
921 }
902 }
@@ -1303,14 +1284,10 @@ AbstractStage {
1303 windowedRightEdgeMaths.startY = appDelegate.requestedY
1284 windowedRightEdgeMaths.startY = appDelegate.requestedY
1304
1285
1305 if (index == 1) {
1286 if (index == 1) {
1306− print("should calculate overlap from", model.application.appId, "with", appRepeater.itemAt(0).application.appId)
1307 var thisRect = { x: appDelegate.windowedX, y: appDelegate.windowedY, width: appDelegate.requestedWidth, height: appDelegate.requestedHeight }
1287 var thisRect = { x: appDelegate.windowedX, y: appDelegate.windowedY, width: appDelegate.requestedWidth, height: appDelegate.requestedHeight }
1308− print("thisRect:", thisRect.x, thisRect.y, thisRect.width, thisRect.height)
1309 var otherDelegate = appRepeater.itemAt(0);
1288 var otherDelegate = appRepeater.itemAt(0);
1310 var otherRect = { x: otherDelegate.windowedX, y: otherDelegate.windowedY, width: otherDelegate.requestedWidth, height: otherDelegate.requestedHeight }
1289 var otherRect = { x: otherDelegate.windowedX, y: otherDelegate.windowedY, width: otherDelegate.requestedWidth, height: otherDelegate.requestedHeight }
1311− print("otherRect:", otherRect.x, otherRect.y, otherRect.width, otherRect.height)
1312 var intersectionRect = MathUtils.intersectionRect(thisRect, otherRect)
1290 var intersectionRect = MathUtils.intersectionRect(thisRect, otherRect)
1313− print("intersection is", intersectionRect.x, intersectionRect.y, intersectionRect.width, intersectionRect.height)
1314 var mappedInterSectionRect = appDelegate.mapFromItem(root, intersectionRect.x, intersectionRect.y)
1291 var mappedInterSectionRect = appDelegate.mapFromItem(root, intersectionRect.x, intersectionRect.y)
1315 opacityEffect.maskX = mappedInterSectionRect.x
1292 opacityEffect.maskX = mappedInterSectionRect.x
1316 opacityEffect.maskY = mappedInterSectionRect.y
1293 opacityEffect.maskY = mappedInterSectionRect.y
@@ -1369,7 +1346,6 @@ AbstractStage {
1369 visible: enabled
1346 visible: enabled
1370
1347
1371 onPressed: {
1348 onPressed: {
1372− print("***** focusing because of resize area press", model.application.appId)
1373 appDelegate.focus = true;
1349 appDelegate.focus = true;
1374 }
1350 }
1375
1351
@@ -1482,7 +1458,6 @@ AbstractStage {
1482
1458
1483 onClicked: {
1459 onClicked: {
1484 spreadItem.highlightedIndex = index;
1460 spreadItem.highlightedIndex = index;
1485− print("*****************setting highlighted index to:", index, appRepeater.itemAt(index))
1486 if (distance == 0) {
1461 if (distance == 0) {
1487 priv.goneToSpread = false;
1462 priv.goneToSpread = false;
1488 }
1463 }
@@ -1669,7 +1644,6 @@ AbstractStage {
1669 }
1644 }
1670
1645
1671 onDraggingChanged: {
1646 onDraggingChanged: {
1672− print("dda dragging changed", dragging)
1673 if (dragging) {
1647 if (dragging) {
1674 // A potential edge-drag gesture has started. Start recording it
1648 // A potential edge-drag gesture has started. Start recording it
1675 gesturePoints = [];
1649 gesturePoints = [];
@@ -1683,7 +1657,6 @@ AbstractStage {
1683 var oneWayFlickToRight = true;
1657 var oneWayFlickToRight = true;
1684 var smallestX = gesturePoints[0]-1;
1658 var smallestX = gesturePoints[0]-1;
1685 for (var i = 0; i < gesturePoints.length; i++) {
1659 for (var i = 0; i < gesturePoints.length; i++) {
1686− print("have point:", gesturePoints[i])
1687 if (gesturePoints[i] <= smallestX) {
1660 if (gesturePoints[i] <= smallestX) {
1688 oneWayFlickToRight = false;
1661 oneWayFlickToRight = false;
1689 break;
1662 break;
@@ -1719,7 +1692,6 @@ AbstractStage {
1719 break;
1692 break;
1720 }
1693 }
1721 }
1694 }
1722− print("playing focus animation 1")
1723 appRepeater.itemAt(priv.nextInStack).playFocusAnimation()
1695 appRepeater.itemAt(priv.nextInStack).playFocusAnimation()
1724 } else {
1696 } else {
1725 cancelled = true;
1697 cancelled = true;
@@ -1741,11 +1713,9 @@ AbstractStage {
1741 dragComponentProperties: { "appDelegate": appDelegate }
1713 dragComponentProperties: { "appDelegate": appDelegate }
1742
1714
1743 onPressed: {
1715 onPressed: {
1744− print("********* triGestureArea pressed!")
1745 function matchDelegate(obj) { return String(obj.objectName).indexOf("appDelegate") >= 0; }
1716 function matchDelegate(obj) { return String(obj.objectName).indexOf("appDelegate") >= 0; }
1746
1717
1747 var delegateAtCenter = Functions.itemAt(appContainer, x, y, matchDelegate);
1718 var delegateAtCenter = Functions.itemAt(appContainer, x, y, matchDelegate);
1748− print("dragging delegate", delegateAtCenter)
1749 if (!delegateAtCenter) return;
1719 if (!delegateAtCenter) return;
1750
1720
1751 appDelegate = delegateAtCenter;
1721 appDelegate = delegateAtCenter;
qml/Stage/StageMaths.qml−2
@@ -38,7 +38,6 @@ QtObject {
38 return 0;
38 return 0;
39 }
39 }
40
40
41− print("App:", model.application.appId, "index:", itemIndex, "nextInStack:", nextInStack)
42 if (nextInStack > 0) {
41 if (nextInStack > 0) {
43 var stageOfNextInStack = appRepeater.itemAt(nextInStack).stage;
42 var stageOfNextInStack = appRepeater.itemAt(nextInStack).stage;
44
43
@@ -55,7 +54,6 @@ QtObject {
55 // if the next app in stack is a sidestage app, it must order on top of other side stage app
54 // if the next app in stack is a sidestage app, it must order on top of other side stage app
56 return 1;
55 return 1;
57 }
56 }
58− print("returning", Math.min(2, topLevelSurfaceList.count-1), topLevelSurfaceList.count)
59 return Math.min(2, topLevelSurfaceList.count-1);
57 return Math.min(2, topLevelSurfaceList.count-1);
60 }
58 }
61 return Math.min(index+1, topLevelSurfaceList.count-1);
59 return Math.min(index+1, topLevelSurfaceList.count-1);
qml/Stage/SurfaceContainer.qml−1
@@ -114,7 +114,6 @@ FocusScope {
114 objectName: "animationsLoader"
114 objectName: "animationsLoader"
115 active: root.surface
115 active: root.surface
116 source: {
116 source: {
117− print("++++++++++++++++++++++++++++++++++++++++++++ loading animation!!!", root.isPromptSurface, surfaceItem, root)
118 if (root.isPromptSurface) {
117 if (root.isPromptSurface) {
119 return "PromptSurfaceAnimations.qml";
118 return "PromptSurfaceAnimations.qml";
120 } else {
119 } else {
qml/Stage/WindowControlsOverlay.qml−4
@@ -86,10 +86,6 @@ Item {
86 id: overlayTimer
86 id: overlayTimer
87 interval: 2000
87 interval: 2000
88 repeat: priv.dragging
88 repeat: priv.dragging
89− onTriggered: {
90− print("timer triggered")
91− }
92− onRunningChanged: print("timer running changed", running)
93 }
89 }
94
90
95 QtObject {
91 QtObject {
qml/Stage/WindowResizeArea.qml−1
@@ -78,7 +78,6 @@ MouseArea {
78 Qt.rect(target.windowedX, target.windowedY, defaultWidth, defaultHeight));
78 Qt.rect(target.windowedX, target.windowedY, defaultWidth, defaultHeight));
79
79
80
80
81− print("loading Window state!", root.windowId, windowGeometry.width, windowGeometry.height)
82 target.windowedWidth = Qt.binding(function() { return Math.min(Math.max(windowGeometry.width, d.minimumWidth), screenWidth - root.leftMargin); });
81 target.windowedWidth = Qt.binding(function() { return Math.min(Math.max(windowGeometry.width, d.minimumWidth), screenWidth - root.leftMargin); });
83 target.windowedHeight = Qt.binding(function() { return Math.min(Math.max(windowGeometry.height, d.minimumHeight),
82 target.windowedHeight = Qt.binding(function() { return Math.min(Math.max(windowGeometry.height, d.minimumHeight),
84 root.screenHeight - (target.fullscreen ? 0 : PanelState.panelHeight)); });
83 root.screenHeight - (target.fullscreen ? 0 : PanelState.panelHeight)); });
tests/qmltests/tst_Shell.qml+2−8
@@ -206,7 +206,7 @@ Rectangle {
206 childs.push(shellLoader.item)
206 childs.push(shellLoader.item)
207 while (childs.length > 0) {
207 while (childs.length > 0) {
208 if (childs[0].activeFocus && childs[0].focus && childs[0].objectName != "shell") {
208 if (childs[0].activeFocus && childs[0].focus && childs[0].objectName != "shell") {
209− print("Active focus is on item:", childs[0]);
209+ console.log("Active focus is on item:", childs[0]);
210 return;
210 return;
211 }
211 }
212 for (var i in childs[0].children) {
212 for (var i in childs[0].children) {
@@ -214,7 +214,7 @@ Rectangle {
214 }
214 }
215 childs.splice(0, 1);
215 childs.splice(0, 1);
216 }
216 }
217− print("No active focused item found within shell.")
217+ console.log("No active focused item found within shell.")
218 }
218 }
219 }
219 }
220 }
220 }
@@ -243,9 +243,7 @@ Rectangle {
243 activeFocusOnPress: false
243 activeFocusOnPress: false
244 model: ["phone", "tablet", "desktop"]
244 model: ["phone", "tablet", "desktop"]
245 onSelectedIndexChanged: {
245 onSelectedIndexChanged: {
246−// shellLoader.active = false;
247 shellLoader.state = model[selectedIndex];
246 shellLoader.state = model[selectedIndex];
248−// shellLoader.active = true;
249 }
247 }
250 }
248 }
251 Label {
249 Label {
@@ -1855,12 +1853,10 @@ Rectangle {
1855 var y = shell.height * (data.tileInfo ? .9 : 0.5)
1853 var y = shell.height * (data.tileInfo ? .9 : 0.5)
1856 mouseMove(shell, x, y)
1854 mouseMove(shell, x, y)
1857 while (spreadItem.highlightedIndex !== 2 && x <= 4000) {
1855 while (spreadItem.highlightedIndex !== 2 && x <= 4000) {
1858− print("hightlight", spreadItem.highlightedIndex, x, y)
1859 x+=10;
1856 x+=10;
1860 mouseMove(shell, x, y)
1857 mouseMove(shell, x, y)
1861 wait(0); // spin the loop so bindings get evaluated
1858 wait(0); // spin the loop so bindings get evaluated
1862 }
1859 }
1863− print("hightlight", spreadItem.highlightedIndex)
1864 tryCompare(decoratedWindow, "showHighlight", true);
1860 tryCompare(decoratedWindow, "showHighlight", true);
1865
1861
1866 // Click the tile
1862 // Click the tile
@@ -1868,7 +1864,6 @@ Rectangle {
1868
1864
1869 // Verify that we left the spread and app2 is the focused one now
1865 // Verify that we left the spread and app2 is the focused one now
1870 tryCompare(stage, "state", "windowed");
1866 tryCompare(stage, "state", "windowed");
1871− print("selected:", surface.name)
1872 tryCompare(surface, "focused", true);
1867 tryCompare(surface, "focused", true);
1873
1868
1874 keyRelease(Qt.Key_Alt);
1869 keyRelease(Qt.Key_Alt);
@@ -2374,7 +2369,6 @@ Rectangle {
2374 tryCompare(launcherPanel, "x", 0)
2369 tryCompare(launcherPanel, "x", 0)
2375 waitForRendering(shell)
2370 waitForRendering(shell)
2376 var shownSize = appDelegate.width;
2371 var shownSize = appDelegate.width;
2377− print("launcher size:", launcher.panelWidth, "hidden:", hiddenSize, "shown:", shownSize)
2378
2372
2379 compare(shownSize + launcher.panelWidth, hiddenSize);
2373 compare(shownSize + launcher.panelWidth, hiddenSize);
2380 }
2374 }