CompositorService: improved Hyprland detection so there is no warning on Niri.
This commit is contained in:
parent
b66bb46fc1
commit
dd4641eedd
1 changed files with 44 additions and 35 deletions
|
|
@ -15,6 +15,8 @@ Singleton {
|
||||||
property bool isHyprland: false
|
property bool isHyprland: false
|
||||||
property bool isNiri: false
|
property bool isNiri: false
|
||||||
|
|
||||||
|
readonly property string hyprlandSignature: Quickshell.env("HYPRLAND_INSTANCE_SIGNATURE")
|
||||||
|
|
||||||
// Generic workspace and window data
|
// Generic workspace and window data
|
||||||
property ListModel workspaces: ListModel {}
|
property ListModel workspaces: ListModel {}
|
||||||
property var windows: []
|
property var windows: []
|
||||||
|
|
@ -50,6 +52,10 @@ Singleton {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Hyprland connections
|
// Hyprland connections
|
||||||
|
Loader {
|
||||||
|
active: isHyprland
|
||||||
|
sourceComponent: Component {
|
||||||
|
Item {
|
||||||
Connections {
|
Connections {
|
||||||
target: Hyprland.workspaces
|
target: Hyprland.workspaces
|
||||||
enabled: isHyprland
|
enabled: isHyprland
|
||||||
|
|
@ -89,11 +95,14 @@ Singleton {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function detectCompositor() {
|
function detectCompositor() {
|
||||||
try {
|
try {
|
||||||
// Try Hyprland first
|
// Try Hyprland first
|
||||||
if (Hyprland.eventSocketPath) {
|
if (hyprlandSignature && hyprlandSignature.length > 0) {
|
||||||
compositorType = "hyprland"
|
compositorType = "hyprland"
|
||||||
isHyprland = true
|
isHyprland = true
|
||||||
isNiri = false
|
isNiri = false
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue