on xenial help sign in
Make TabletShell::test_leftEdgeDrag(with demo) pass again
commite55b3fbd5d6caf5be8acaa6d092158dc4a1b1a65 authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateMon 8 Dec 2014, 17:00 (12 years ago) parent946d2fa
2 files changed+16−13
qml/Shell.qml+1−1 tests/qmltests/tst_TabletShell.qml+15−12
qml/Shell.qml+1−1
@@ -558,7 +558,7 @@ Item {
558558 // FIXME: Fix TouchRegistry & friends and remove this workaround
559559 // Issue involves launcher's DDA getting disabled on a long
560560 // left-edge drag
561− dragHandleLeftMargin: launcher.dragAreaWidth + 1
561+ dragHandleLeftMargin: launcher.available ? launcher.dragAreaWidth + 1 : 0
562562
563563 function startUnlock() {
564564 if (narrowMode) {
tests/qmltests/tst_TabletShell.qml+15−12
@@ -74,21 +74,24 @@ Row {
7474 Column {
7575 anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
7676 spacing: units.gu(1)
77− Row {
78− anchors { left: parent.left; right: parent.right }
79− Button {
80− text: "Show Greeter"
81− onClicked: {
82− if (shellLoader.status !== Loader.Ready)
83− return
84−
85− var greeter = testCase.findChild(shellLoader.item, "greeter")
86− if (!greeter.shown) {
87− greeter.show()
88− }
77+ Button {
78+ text: "Show Greeter"
79+ onClicked: {
80+ if (shellLoader.status !== Loader.Ready)
81+ return
82+
83+ var greeter = testCase.findChild(shellLoader.item, "greeter")
84+ if (!greeter.shown) {
85+ greeter.show()
8986 }
9087 }
9188 }
89+ Button {
90+ text: "Demo edges"
91+ onClicked: {
92+ AccountsService.demoEdges = true
93+ }
94+ }
9295 }
9396 }
9497