git.iko.soy/unity8
on xenial help sign in
fix focus issue after launching something from drawer
commit55c26c244a730fd8553d2b59d4675d8cf3ba1030 authorMichael Zanetti <michael.zanetti@canonical.com> dateMon 21 Nov 2016, 13:25 (10 years ago) parent68559d2
2 files changed+14−1
compare with xenial
unifiedsplit
qml/Launcher/Launcher.qml+2−1 tests/qmltests/Launcher/tst_Drawer.qml+12
qml/Launcher/Launcher.qml+2−1
@@ -349,8 +349,9 @@ FocusScope {
349349 visible: x > -width
350350
351351 onApplicationSelected: {
352− root.launcherApplicationSelected(appId)
353352 root.hide();
353+ root.launcherApplicationSelected(appId)
354+ root.focus = false;
354355 }
355356
356357 Keys.onEscapePressed: {
tests/qmltests/Launcher/tst_Drawer.qml+12
@@ -188,5 +188,17 @@ StyledItem {
188188
189189 tryCompare(launcher, "state", "");
190190 }
191+
192+ function test_launcherGivesUpFocusAfterLaunchingFromDrawer() {
193+ dragDrawerIntoView();
194+
195+ tryCompare(launcher, "focus", true);
196+
197+ var drawerList = findChild(launcher, "drawerItemList");
198+ var dialerApp = findChild(drawerList, "drawerItem_dialer-app");
199+ mouseClick(dialerApp, dialerApp.width / 2, dialerApp.height / 2);
200+
201+ tryCompare(launcher, "focus", false);
202+ }
191203 }
192204}