git.iko.soy/unity8
on xenial help sign in
fix an issue with locked out launcher, added test
commitc0adebb8bbb32ba74d89fb3affed3ed8fd49bf27 authorMichael Zanetti <michael.zanetti@canonical.com> dateMon 28 Nov 2016, 15:54 (10 years ago) parentd2db6b0
2 files changed+18−3
compare with xenial
unifiedsplit
qml/Launcher/Launcher.qml+4 tests/qmltests/Launcher/tst_Drawer.qml+14−3
qml/Launcher/Launcher.qml+4
@@ -549,6 +549,10 @@ FocusScope {
549549 target: panel
550550 x: -root.x // so we never go past panelWidth, even when teased by tutorial
551551 }
552+ PropertyChanges {
553+ target: drawer
554+ anchors.rightMargin: 0
555+ }
552556 },
553557 State {
554558 name: "drawer"
tests/qmltests/Launcher/tst_Drawer.qml+14−3
@@ -158,15 +158,26 @@ StyledItem {
158158 revealByEdgePush();
159159 }
160160
161− function test_hideByDraggingDrawer() {
161+ function test_hideByDraggingDrawer_data() {
162+ return [
163+ {tag: "autohide", autohide: true, endState: ""},
164+ {tag: "locked", autohide: false, endState: "visible"}
165+ ]
166+ }
167+
168+ function test_hideByDraggingDrawer(data) {
169+ launcher.lockedVisible = !data.autohide;
170+
162171 dragDrawerIntoView();
163172 waitForRendering(launcher);
164173
165174 var drawer = findChild(launcher, "drawer");
166175
167− mouseFlick(root, drawer.width - units.gu(1), drawer.height / 2, 0, drawer.height / 2, true, true);
176+ mouseFlick(root, drawer.width - units.gu(1), drawer.height / 2, units.gu(2), drawer.height / 2, true, true);
168177
169− tryCompare(launcher, "state", "");
178+ tryCompare(drawer.anchors, "rightMargin", 0);
179+ tryCompare(launcher, "state", data.endState);
180+ launcher.lockedVisible = false;
170181 }
171182
172183 function test_hideByClickingOutside() {