git.iko.soy/unity8
on xenial help sign in
fix a test
dc5895dMichael Zanetti
qml/Stage/Spread/StagedRightEdgeMaths.qml−4
compare with xenial
unifiedsplit
@@ -50,10 +50,6 @@ QtObject {
50 readonly property int animatedX: {
50 readonly property int animatedX: {
51 var nextStage = appRepeater.itemAt(nextInStack) ? appRepeater.itemAt(nextInStack).stage : ApplicationInfoInterface.MainStage;
51 var nextStage = appRepeater.itemAt(nextInStack) ? appRepeater.itemAt(nextInStack).stage : ApplicationInfoInterface.MainStage;
52
52
53− if (model.application.appId == "unity8-dash") {
54− print("calculating X for dash:", itemIndex, nextInStack, nextStage, "(Main:", ApplicationInfoInterface.MainStage,")", appRepeater.itemAt(nextInStack).stage)
55− }
56−
57 var startX = 0;
53 var startX = 0;
58 if (isMainStageApp) {
54 if (isMainStageApp) {
59 if (progress < breakPoint) {
55 if (progress < breakPoint) {
qml/Stage/Stage.qml+1
@@ -388,6 +388,7 @@ AbstractStage {
388
388
389 Spread {
389 Spread {
390 id: spreadItem
390 id: spreadItem
391+ objectName: "spreadItem"
391 anchors.fill: appContainer
392 anchors.fill: appContainer
392 leftMargin: root.leftMargin
393 leftMargin: root.leftMargin
393 model: root.topLevelSurfaceList
394 model: root.topLevelSurfaceList
tests/qmltests/tst_Shell.qml+12−9
@@ -1707,30 +1707,33 @@ Rectangle {
1707 function test_altBackTabNavigation() {
1707 function test_altBackTabNavigation() {
1708 loadDesktopShellWithApps();
1708 loadDesktopShellWithApps();
1709
1709
1710− var spreadRepeater = findInvisibleChild(shell, "spreadRepeater");
1710+ print("findItem")
1711+ var spreadItem = findChild(shell, "spreadItem");
1712+ print("starting verify")
1711− verify(spreadRepeater !== null);
1713+ verify(spreadItem !== null);
1714+ print("verify done")
1712
1715
1713 keyPress(Qt.Key_Alt)
1716 keyPress(Qt.Key_Alt)
1714 keyClick(Qt.Key_Tab);
1717 keyClick(Qt.Key_Tab);
1715− tryCompare(spreadRepeater, "highlightedIndex", 1);
1718+ tryCompare(spreadItem, "highlightedIndex", 1);
1716
1719
1717 keyClick(Qt.Key_Tab);
1720 keyClick(Qt.Key_Tab);
1718− tryCompare(spreadRepeater, "highlightedIndex", 2);
1721+ tryCompare(spreadItem, "highlightedIndex", 2);
1719
1722
1720 keyClick(Qt.Key_Tab);
1723 keyClick(Qt.Key_Tab);
1721− tryCompare(spreadRepeater, "highlightedIndex", 3);
1724+ tryCompare(spreadItem, "highlightedIndex", 3);
1722
1725
1723 keyClick(Qt.Key_Tab);
1726 keyClick(Qt.Key_Tab);
1724− tryCompare(spreadRepeater, "highlightedIndex", 4);
1727+ tryCompare(spreadItem, "highlightedIndex", 4);
1725
1728
1726 keyClick(Qt.Key_Backtab);
1729 keyClick(Qt.Key_Backtab);
1727− tryCompare(spreadRepeater, "highlightedIndex", 3);
1730+ tryCompare(spreadItem, "highlightedIndex", 3);
1728
1731
1729 keyClick(Qt.Key_Backtab);
1732 keyClick(Qt.Key_Backtab);
1730− tryCompare(spreadRepeater, "highlightedIndex", 2);
1733+ tryCompare(spreadItem, "highlightedIndex", 2);
1731
1734
1732 keyClick(Qt.Key_Backtab);
1735 keyClick(Qt.Key_Backtab);
1733− tryCompare(spreadRepeater, "highlightedIndex", 1);
1736+ tryCompare(spreadItem, "highlightedIndex", 1);
1734
1737
1735 keyRelease(Qt.Key_Alt);
1738 keyRelease(Qt.Key_Alt);
1736 }
1739 }