git.iko.soy/unity8
on xenial help sign in
Fix hiding drawer using Super key
7013f90Ratchanan Srirattanamet
qml/Launcher/Launcher.qml+7−5
compare with xenial
unifiedsplit
@@ -183,7 +183,7 @@ FocusScope {
183 switchToNextState("visible")
183 switchToNextState("visible")
184 }
184 }
185
185
186− function toggleDrawer(focusInputField, onlyOpen) {
186+ function toggleDrawer(focusInputField, onlyOpen, alsoToggleLauncher) {
187 if (!drawerEnabled) {
187 if (!drawerEnabled) {
188 return;
188 return;
189 }
189 }
@@ -196,11 +196,13 @@ FocusScope {
196 if (focusInputField) {
196 if (focusInputField) {
197 drawer.focusInput();
197 drawer.focusInput();
198 }
198 }
199− if (state === "drawer" && !onlyOpen) {
199+ if (state === "drawer" && !onlyOpen)
200+ if (alsoToggleLauncher && !root.lockedVisible)
201+ switchToNextState("");
202+ else
200− switchToNextState("visible");
203+ switchToNextState("visible");
201− } else {
204+ else
202 switchToNextState("drawer");
205 switchToNextState("drawer");
203− }
204 }
206 }
205
207
206 Keys.onPressed: {
208 Keys.onPressed: {
qml/Shell.qml+3−1
@@ -253,7 +253,9 @@ StyledItem {
253 onHomeKeyActivated: {
253 onHomeKeyActivated: {
254 // Ignore when greeter is active, to avoid pocket presses
254 // Ignore when greeter is active, to avoid pocket presses
255 if (!greeter.active) {
255 if (!greeter.active) {
256− launcher.toggleDrawer(false);
256+ launcher.toggleDrawer(/* focusInputField */ false,
257+ /* onlyOpen */ false,
258+ /* alsoToggleLauncher */ true);
257 }
259 }
258 }
260 }
259 onTouchBegun: { cursor.opacity = 0; }
261 onTouchBegun: { cursor.opacity = 0; }