1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-06-25 04:25:22 -04:00

compositor/workspace: fix DMS binding to ext-workspace-v1 even when we

don't use it
This commit is contained in:
bbedward
2026-06-24 14:22:05 -04:00
parent 52834c6a35
commit 2fc3b8ee4a
2 changed files with 4 additions and 0 deletions
@@ -94,6 +94,8 @@ Item {
readonly property bool useExtWorkspace: { readonly property bool useExtWorkspace: {
if (Quickshell.env("DMS_FORCE_EXTWS") === "1") if (Quickshell.env("DMS_FORCE_EXTWS") === "1")
return (WindowManager.windowsets?.length ?? 0) > 0; return (WindowManager.windowsets?.length ?? 0) > 0;
if (!CompositorService.compositorDetected)
return false;
switch (CompositorService.compositor) { switch (CompositorService.compositor) {
case "niri": case "niri":
case "hyprland": case "hyprland":
@@ -21,6 +21,7 @@ Singleton {
property bool isMiracle: false property bool isMiracle: false
property bool isLabwc: false property bool isLabwc: false
property string compositor: "unknown" property string compositor: "unknown"
property bool compositorDetected: false
readonly property bool useHyprlandFocusGrab: isHyprland && Quickshell.env("DMS_HYPRLAND_EXCLUSIVE_FOCUS") !== "1" readonly property bool useHyprlandFocusGrab: isHyprland && Quickshell.env("DMS_HYPRLAND_EXCLUSIVE_FOCUS") !== "1"
readonly property string hyprlandSignature: Quickshell.env("HYPRLAND_INSTANCE_SIGNATURE") readonly property string hyprlandSignature: Quickshell.env("HYPRLAND_INSTANCE_SIGNATURE")
@@ -832,6 +833,7 @@ Singleton {
repeat: false repeat: false
onTriggered: { onTriggered: {
detectCompositor(); detectCompositor();
compositorDetected = true;
Qt.callLater(() => { Qt.callLater(() => {
NiriService.generateNiriLayoutConfig(); NiriService.generateNiriLayoutConfig();
HyprlandService.generateLayoutConfig(); HyprlandService.generateLayoutConfig();