marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

windowplugin: Fix remaining references to old plugin

Browse source
This commit is contained in:
Devin Lin 2023-03-15 08:20:15 -07:00
parent 0775c56153
commit 8d311ed97b
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
components/mobileshellstate/qml/HomeScreenControls.qml
View file

@ -5,7 +5,8 @@
import QtQuick 2.12 import QtQuick 2.12
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import org.kde.plasma.private.mobileshell 1.0 as MobileShell import org.kde.plasma.private.mobileshell as MobileShell
import org.kde.plasma.private.mobileshell.windowplugin as WindowPlugin
pragma Singleton pragma Singleton
@ -30,10 +31,10 @@ QtObject {
property bool homeScreenVisible: true property bool homeScreenVisible: true
property var windowListener: Connections { property var windowListener: Connections {
target: MobileShell.WindowUtil target: WindowPlugin.WindowUtil
function onAllWindowsMinimizedChanged() { function onAllWindowsMinimizedChanged() {
root.homeScreenVisible = MobileShell.WindowUtil.allWindowsMinimized root.homeScreenVisible = WindowPlugin.WindowUtil.allWindowsMinimized
} }
} }
} }

7
containments/homescreens/halcyon/package/contents/ui/main.qml
View file

@ -12,6 +12,7 @@ import org.kde.plasma.components 3.0 as PlasmaComponents
import org.kde.plasma.private.mobileshell as MobileShell import org.kde.plasma.private.mobileshell as MobileShell
import org.kde.plasma.private.mobileshell.state as MobileShellState import org.kde.plasma.private.mobileshell.state as MobileShellState
import org.kde.private.mobile.homescreen.halcyon as Halcyon import org.kde.private.mobile.homescreen.halcyon as Halcyon
import org.kde.plasma.private.mobileshell.windowplugin as WindowPlugin
MobileShell.HomeScreen { MobileShell.HomeScreen {
id: root id: root
@ -45,7 +46,7 @@ MobileShell.HomeScreen {
// - minimize windows (only if we are in an app) // - minimize windows (only if we are in an app)
// - open app drawer // - open app drawer
// - close app drawer and, if necessary, restore windows // - close app drawer and, if necessary, restore windows
if (!MobileShell.WindowUtil.showDesktop && !MobileShellState.Shell.homeScreenVisible if (!WindowPlugin.WindowUtil.showDesktop && !MobileShellState.Shell.homeScreenVisible
|| search.isOpen || search.isOpen
) { ) {
// Always close action drawer // Always close action drawer
@ -60,11 +61,11 @@ MobileShell.HomeScreen {
homescreen.page = 0; homescreen.page = 0;
MobileShell.WindowUtil.showDesktop = true; WindowPlugin.WindowUtil.showDesktop = true;
} else if (homescreen.page == 0) { } else if (homescreen.page == 0) {
homescreen.page = 1; homescreen.page = 1;
} else { } else {
MobileShell.WindowUtil.showDesktop = false; WindowPlugin.WindowUtil.showDesktop = false;
homescreen.page = 0; homescreen.page = 0;
} }
} }