Shell: cleanup

This commit is contained in:
ItsLemmy
2025-11-06 22:37:39 -05:00
parent 838a469656
commit a536a033c9
3 changed files with 100 additions and 91 deletions

View File

@@ -9,16 +9,12 @@
// Qt & Quickshell Core
import QtQuick
import Quickshell
import Quickshell.Io
import Quickshell.Services.Pipewire
import Quickshell.Widgets
// Commons & Services
import qs.Commons
import qs.Services
import qs.Widgets
// Panel Windows
// Modules
import qs.Modules.Background
import qs.Modules.Dock
import qs.Modules.MainScreen
@@ -99,62 +95,8 @@ ShellRoot {
// Item that needs to exists in the shell.
IPCService {}
// ------------------------------
// MainScreen for each screen (manages bar + all panels)
// Wrapped in Loader to optimize memory - only loads when screen needs it
Variants {
model: Quickshell.screens
delegate: Item {
required property ShellScreen modelData
property bool shouldBeActive: {
if (!modelData || !modelData.name)
Logger.d("Shell", "MainScreen activated for", modelData?.name)
return true
}
property bool windowLoaded: false
Loader {
id: windowLoader
active: parent.shouldBeActive
asynchronous: false
property ShellScreen loaderScreen: modelData
onLoaded: {
// Signal that window is loaded so exclusion zone can be created
parent.windowLoaded = true
}
sourceComponent: MainScreen {
screen: windowLoader.loaderScreen
}
}
// BarExclusionZone - created after MainScreen has fully loaded
// Disabled when bar is hidden or not configured for this screen
Loader {
active: {
if (!parent.windowLoaded || !parent.shouldBeActive || !BarService.isVisible)
return false
// Check if bar is configured for this screen
var monitors = Settings.data.bar.monitors || []
return monitors.length === 0 || monitors.includes(modelData?.name)
}
asynchronous: false
sourceComponent: BarExclusionZone {
screen: modelData
}
onLoaded: {
Logger.d("Shell", "BarExclusionZone created for", modelData?.name)
}
}
}
}
MainScreens {}
}
}