Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-28 15:32:50 -05:00
Code Packages Releases Activity

Revert "feat: add configurable per-monitor workspace filtering and system tray monitor selection (#163)"

Browse Source 
This reverts commit 68157ca636.
This commit is contained in:
bbedward
2025-11-12 15:52:04 -05:00
parent 77eb5dd3bf
commit b79e9f72ce
1 changed files with 0 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,8 +37,6 @@ Item {
return getExtWorkspaceActiveWorkspace() return getExtWorkspaceActiveWorkspace()
} else if (CompositorService.isNiri) { } else if (CompositorService.isNiri) {
return getNiriActiveWorkspace() return getNiriActiveWorkspace()
} else if (CompositorService.isHyprland) {
return getHyprlandActiveWorkspace()
} else if (CompositorService.isDwl) { } else if (CompositorService.isDwl) {
const activeTags = getDwlActiveTags() const activeTags = getDwlActiveTags()
return activeTags.length > 0 ? activeTags[0] : -1 return activeTags.length > 0 ? activeTags[0] : -1
@@ -62,11 +60,6 @@ Item {
const baseList = getNiriWorkspaces() const baseList = getNiriWorkspaces()
return SettingsData.showWorkspacePadding ? padWorkspaces(baseList) : baseList return SettingsData.showWorkspacePadding ? padWorkspaces(baseList) : baseList
} }
if (CompositorService.isHyprland) {
const baseList = getHyprlandWorkspaces()
const filteredList = baseList.filter(ws => ws.id > -1)
return SettingsData.showWorkspacePadding ? padWorkspaces(filteredList) : filteredList
}
if (CompositorService.isDwl) { if (CompositorService.isDwl) {
const baseList = getDwlTags() const baseList = getDwlTags()
return SettingsData.showWorkspacePadding ? padWorkspaces(baseList) : baseList return SettingsData.showWorkspacePadding ? padWorkspaces(baseList) : baseList
@@ -243,51 +236,6 @@ Item {
return activeWs ? activeWs.idx + 1 : 1 return activeWs ? activeWs.idx + 1 : 1
} }
function getHyprlandWorkspaces() {
const workspaces = Hyprland.workspaces?.values || []
if (!root.screenName || !SettingsData.workspacesPerMonitor) {
// Show all workspaces on all monitors if per-monitor filtering is disabled
const sorted = workspaces.slice().sort((a, b) => a.id - b.id)
return sorted.length > 0 ? sorted : [{
"id": 1,
"name": "1"
}]
}
// Filter workspaces for this specific monitor using lastIpcObject.monitor
// This matches the approach from the original kyle-config
const monitorWorkspaces = workspaces.filter(ws => {
return ws.lastIpcObject && ws.lastIpcObject.monitor === root.screenName
})
if (monitorWorkspaces.length === 0) {
// Fallback if no workspaces exist for this monitor
return [{
"id": 1,
"name": "1"
}]
}
// Return all workspaces for this monitor, sorted by ID
return monitorWorkspaces.sort((a, b) => a.id - b.id)
}
function getHyprlandActiveWorkspace() {
if (!root.screenName || !SettingsData.workspacesPerMonitor) {
return Hyprland.focusedWorkspace ? Hyprland.focusedWorkspace.id : 1
}
const monitors = Hyprland.monitors?.values || []
const currentMonitor = monitors.find(monitor => monitor.name === root.screenName)
if (!currentMonitor) {
return 1
}
return currentMonitor.activeWorkspace?.id ?? 1
}
function getDwlTags() { function getDwlTags() {
if (!DwlService.dwlAvailable) { if (!DwlService.dwlAvailable) {
return [] return []