From da347cb2dc68b7811440bd1d4e94840f6d67eb0a Mon Sep 17 00:00:00 2001 From: Yari Polla Date: Fri, 23 Sep 2022 20:36:34 +0200 Subject: [PATCH] homescreens/folio: fix Meta key support --- .../folio/package/contents/ui/main.qml | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/containments/homescreens/folio/package/contents/ui/main.qml b/containments/homescreens/folio/package/contents/ui/main.qml index 1ac314fed..97911635b 100644 --- a/containments/homescreens/folio/package/contents/ui/main.qml +++ b/containments/homescreens/folio/package/contents/ui/main.qml @@ -40,20 +40,23 @@ MobileShell.HomeScreen { forceActiveFocus(); } - Plasmoid.onActivated: { - console.log("Triggered!", plasmoid.nativeInterface.showingDesktop) + Plasmoid.onActivated: { + // Always close action drawer + if (MobileShell.TopPanelControls.actionDrawerVisible) { + MobileShell.TopPanelControls.closeActionDrawer(); + } // there's a couple of steps: - // - minimize windows + // - minimize windows (only if we are in an app) // - open app drawer - // - restore windows - if (!plasmoid.nativeInterface.showingDesktop) { + // - close app drawer and, if necessary, restore windows + if (!plasmoid.nativeInterface.showingDesktop && !MobileShell.HomeScreenControls.homeScreenVisible) { plasmoid.nativeInterface.showingDesktop = true; - } else if (homescreen.homeScreenState.currentView === MobileShell.HomeScreenState.PageView) { - homescreen.homeScreenState.openAppDrawer() + } else if (homescreen.homeScreenState.currentView === HomeScreenState.PageView) { + homescreen.homeScreenState.openAppDrawer(); } else { - plasmoid.nativeInterface.showingDesktop = false - homescreen.homeScreenState.closeAppDrawer() + plasmoid.nativeInterface.showingDesktop = false; + homescreen.homeScreenState.closeAppDrawer(); } } -- GitLab