e55b3fb · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Make TabletShell::test_leftEdgeDrag(with demo) pass again

e55b3fbDaniel d'Andrada12 years ago

qml/Shell.qml+1−1

compare with xenial

unifiedsplit

@@ -558,7 +558,7 @@ Item {

558 // FIXME: Fix TouchRegistry & friends and remove this workaround

559 // Issue involves launcher's DDA getting disabled on a long

560 // left-edge drag

561− dragHandleLeftMargin: launcher.dragAreaWidth + 1

561+ dragHandleLeftMargin: launcher.available ? launcher.dragAreaWidth + 1 : 0

562

563 function startUnlock() {

564 if (narrowMode) {

tests/qmltests/tst_TabletShell.qml+15−12

@@ -74,21 +74,24 @@ Row {

74 Column {

75 anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }

76 spacing: units.gu(1)

77− Row {

78− anchors { left: parent.left; right: parent.right }

79− Button {

77+ Button {

80− text: "Show Greeter"

78+ text: "Show Greeter"

81− onClicked: {

79+ onClicked: {

82− if (shellLoader.status !== Loader.Ready)

80+ if (shellLoader.status !== Loader.Ready)

83− return

81+ return

84−

82+

85− var greeter = testCase.findChild(shellLoader.item, "greeter")

83+ var greeter = testCase.findChild(shellLoader.item, "greeter")

86− if (!greeter.shown) {

84+ if (!greeter.shown) {

87− greeter.show()

85+ greeter.show()

88− }

89 }

86 }

90 }

87 }

91 }

88 }

89+ Button {

90+ text: "Demo edges"

91+ onClicked: {

92+ AccountsService.demoEdges = true

93+ }

94+ }

92 }

95 }

93 }

96 }