gnome-shell 40 compatibility

[show-app-menu-on-key-press] / extension.js

diff --git a/extension.js b/extension.js
index 96fcac82e354a36091e3de17d2aca1c58fae228a..9fcc55dbc17d7b52071a86c6e0dc015c65de3de0 100644 (file)
--- a/extension.js
+++ b/extension.js
@@ -1,41 +1,34 @@
 const St = imports.gi.St;
 const Main = imports.ui.main;
-const Views = imports.ui.appDisplay.Views;
-
-let signalId = null;
 
 function init() {
 }
 
 function enable() {
-    signalId = global.stage.connect('key-press-event', onStageKeyPress);
-}
+    // show apps on startup
+    Main.layoutManager.connect('startup-complete', () => {
+        Main.overview._overview._controls._toggleAppsPage();
+    });
+
+    // show apps on key press when there are no windows
+    global.stage.connect('key-press-event', () => {
+        if (!hasVisibleWindows() && !Main.overview.visible) {
+            Main.overview.showApps();
+        }
+    });
 
-function disable() {
-    if (signalId) {
-        global.stage.disconnect('key-press-event');
-        signalId = null;
-    }
+    // keyboard focus for apps view
+    Main.overview.connect('shown', () => {
+        if (Main.overview._overview.dash.showAppsButton.checked) {
+            Main.overview._overview._controls.appDisplay.navigate_focus(null, St.DirectionType.TAB_FORWARD, false)
+        }
+    });
+    Main.overview._overview.controls.appDisplay.connect('view-loaded', () => {
+        Main.overview._overview._controls.appDisplay.navigate_focus(null, St.DirectionType.TAB_FORWARD, false)
+    });
 }
 
-function onStageKeyPress() {
-    if (!hasVisibleWindows() && !Main.overview.visible) {
-        Main.overview.viewSelector.showApps();
-        const appDisplay = Main.overview.viewSelector.appDisplay;
-        let view = appDisplay;
-        if (appDisplay._views) { // Gnome 3.36 or older
-
-            view = appDisplay._views[Views.FREQUENT].view;
-        }
-        view._grid.remove_all_children()
-        view._items = new Map();
-        view._orderedItems = [];
-        view._redisplay();
-        if (appDisplay._showView) { // Gnome 3.36 or older
-            appDisplay._showView(Views.FREQUENT);
-        }
-        Main.overview.viewSelector._activePage.navigate_focus(null, St.DirectionType.TAB_FORWARD, false);
-    }
+function disable() {
 }
 
 function hasVisibleWindows() {