Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-04-15 02:02:08 -04:00
Code Packages Releases Activity

dwl: remove wlr-randr dependency

Browse Source
This commit is contained in:
bbedward
2025-10-30 09:21:20 -04:00
parent 986993a890
commit 5033d10246
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/DankBar/Widgets/WorkspaceSwitcher.qml
View File

@@ -596,12 +596,10 @@ Item {
border.width: { border.width: {
if (isUrgent && !isActive) return 2 if (isUrgent && !isActive) return 2
if (CompositorService.isDwl && isActive && root.dwlActiveTags.length > 1) return 2
return 0 return 0
} }
border.color: { border.color: {
if (isUrgent && !isActive) return Theme.error if (isUrgent && !isActive) return Theme.error
if (CompositorService.isDwl && isActive && root.dwlActiveTags.length > 1) return Qt.lighter(Theme.primary, 1.3)
return Theme.withAlpha(Theme.error, 0) return Theme.withAlpha(Theme.error, 0)
} }

4
Services/CompositorService.qml
View File

@@ -488,7 +488,7 @@ Singleton {
for (let i = 0; i < Quickshell.screens.length; i++) { for (let i = 0; i < Quickshell.screens.length; i++) {
const screen = Quickshell.screens[i] const screen = Quickshell.screens[i]
if (screen && screen.name) { if (screen && screen.name) {
Quickshell.execDetached(["wlr-randr", "--output", screen.name, "--off"]) Quickshell.execDetached(["mmsg", "-d", "disable_monitor," + screen.name])
} }
} }
} }
@@ -502,7 +502,7 @@ Singleton {
for (let i = 0; i < Quickshell.screens.length; i++) { for (let i = 0; i < Quickshell.screens.length; i++) {
const screen = Quickshell.screens[i] const screen = Quickshell.screens[i]
if (screen && screen.name) { if (screen && screen.name) {
Quickshell.execDetached(["wlr-randr", "--output", screen.name, "--on"]) Quickshell.execDetached(["mmsg", "-d", "enable_monitor," + screen.name])
} }
} }
} }

19
Services/DwlService.qml
View File

@@ -176,29 +176,34 @@ Singleton {
Process { Process {
id: scaleQueryProcess id: scaleQueryProcess
command: ["wlr-randr", "--json"] command: ["mmsg", "-A"]
running: false running: false
stdout: StdioCollector { stdout: StdioCollector {
onStreamFinished: { onStreamFinished: {
try { try {
const outputData = JSON.parse(text)
const newScales = {} const newScales = {}
for (const outputInfo of outputData) { const lines = text.trim().split('\n')
if (outputInfo.name && outputInfo.scale !== undefined) { for (const line of lines) {
newScales[outputInfo.name] = outputInfo.scale const parts = line.trim().split(/\s+/)
if (parts.length >= 3 && parts[1] === "scale_factor") {
const outputName = parts[0]
const scale = parseFloat(parts[2])
if (!isNaN(scale)) {
newScales[outputName] = scale
}
} }
} }
outputScales = newScales outputScales = newScales
} catch (e) { } catch (e) {
console.warn("DwlService: Failed to parse wlr-randr output:", e) console.warn("DwlService: Failed to parse mmsg output:", e)
} }
} }
} }
onExited: exitCode => { onExited: exitCode => {
if (exitCode !== 0) { if (exitCode !== 0) {
console.warn("DwlService: wlr-randr failed with exit code:", exitCode) console.warn("DwlService: mmsg failed with exit code:", exitCode)
} }
} }
} }