Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2025-12-11 07:52:50 -05:00
Code Packages Releases Activity

hyprland repairs

Browse Source
This commit is contained in:
bbedward
2025-08-23 13:14:26 -04:00
parent f175c10efc
commit ad19107530
5 changed files with 167 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Services/CompositorService.qml
View File

@@ -19,7 +19,7 @@ Singleton {
readonly property string niriSocket: Quickshell.env("NIRI_SOCKET")
property bool useNiriSorting: isNiri && NiriService
property bool useHyprlandSorting: isHyprland && HyprlandService
property bool useHyprlandSorting: false
// Unified sorted toplevels - automatically chooses sorting based on compositor
property var sortedToplevels: {
@@ -32,9 +32,34 @@ Singleton {
return NiriService.sortToplevels(ToplevelManager.toplevels.values)
}
// Use Hyprland sorting when both compositor is Hyprland AND hyprland service is ready
if (useHyprlandSorting) {
return HyprlandService.sortToplevels(ToplevelManager.toplevels.values)
if (isHyprland) {
const hyprlandToplevels = Array.from(Hyprland.toplevels.values)
const sortedHyprland = hyprlandToplevels.sort((a, b) => {
// Sort by monitor first
if (a.monitor && b.monitor) {
const monitorCompare = a.monitor.name.localeCompare(b.monitor.name)
if (monitorCompare !== 0) return monitorCompare
}
// Then by workspace
if (a.workspace && b.workspace) {
const workspaceCompare = a.workspace.id - b.workspace.id
if (workspaceCompare !== 0) return workspaceCompare
}
// Then by position on workspace (x first for columns, then y within column)
if (a.lastIpcObject && b.lastIpcObject && a.lastIpcObject.at && b.lastIpcObject.at) {
const xCompare = a.lastIpcObject.at[0] - b.lastIpcObject.at[0]
if (xCompare !== 0) return xCompare
return a.lastIpcObject.at[1] - b.lastIpcObject.at[1]
}
return 0
})
// Return the wayland Toplevel objects
return sortedHyprland.map(hyprToplevel => hyprToplevel.wayland).filter(wayland => wayland !== null)
}
// For other compositors or when services aren't ready yet, return unsorted toplevels

130
Services/HyprlandService.qml
View File

@@ -1,130 +0,0 @@
pragma Singleton
pragma ComponentBehavior: Bound
import QtQuick
import Quickshell
import Quickshell.Hyprland
Singleton {
id: root
property var allWorkspaces: CompositorService.isHyprland && Hyprland.workspaces ? Hyprland.workspaces.values : []
property var focusedWorkspace: CompositorService.isHyprland ? Hyprland.focusedWorkspace : null
property var monitors: CompositorService.isHyprland ? Hyprland.monitors : []
property var focusedMonitor: CompositorService.isHyprland ? Hyprland.focusedMonitor : null
function getWorkspacesForMonitor(monitorName) {
const workspaces = Hyprland.workspaces ? Hyprland.workspaces.values : []
if (!workspaces || workspaces.length === 0) return []
// If no monitor name specified, return all workspaces
if (!monitorName) {
const allWorkspacesCopy = []
for (let i = 0; i < workspaces.length; i++) {
const workspace = workspaces[i]
if (workspace) {
allWorkspacesCopy.push(workspace)
}
}
allWorkspacesCopy.sort((a, b) => a.id - b.id)
return allWorkspacesCopy
}
const filtered = []
for (let i = 0; i < workspaces.length; i++) {
const workspace = workspaces[i]
if (workspace && workspace.monitor && workspace.monitor.name === monitorName) {
filtered.push(workspace)
}
}
// Sort by workspace ID
filtered.sort((a, b) => a.id - b.id)
return filtered
}
function getCurrentWorkspaceForMonitor(monitorName) {
// If no monitor name specified, return the globally focused workspace
if (!monitorName) {
return focusedWorkspace
}
if (focusedMonitor && focusedMonitor.name === monitorName) {
return focusedWorkspace
}
const monitorWorkspaces = getWorkspacesForMonitor(monitorName)
for (let i = 0; i < monitorWorkspaces.length; i++) {
const ws = monitorWorkspaces[i]
if (ws && ws.active) {
return ws
}
}
return null
}
function getWorkspaceDisplayNumbers() {
// Get all existing workspaces from Hyprland.workspaces.values
const workspaces = Hyprland.workspaces ? Hyprland.workspaces.values : []
if (!workspaces || workspaces.length === 0) {
// If no workspaces detected, show at least current + a few more
const current = getCurrentWorkspaceNumber()
return [Math.max(1, current - 1), current, current + 1, current + 2].filter((ws, i, arr) => arr.indexOf(ws) === i && ws > 0)
}
// Get workspace IDs and ensure we show a reasonable range
const numbers = []
let maxId = 0
for (let i = 0; i < workspaces.length; i++) {
const ws = workspaces[i]
if (ws && ws.id > 0) {
numbers.push(ws.id)
maxId = Math.max(maxId, ws.id)
}
}
// Always ensure we have at least one workspace beyond the highest
// to allow easy navigation to new workspaces
if (maxId > 0 && numbers.indexOf(maxId + 1) === -1) {
numbers.push(maxId + 1)
}
return numbers.sort((a, b) => a - b)
}
function getCurrentWorkspaceNumber() {
// Use the focused workspace directly
const focused = Hyprland.focusedWorkspace
return focused ? focused.id : 1
}
function sortToplevels(toplevels) {
// Create a copy of the array since the original might be readonly
const sortedArray = Array.from(toplevels)
return sortedArray.sort((a, b) => {
if (a.workspace && b.workspace) {
if (a.workspace.monitor && b.workspace.monitor) {
const monitorCompare = a.workspace.monitor.name.localeCompare(b.workspace.monitor.name)
if (monitorCompare !== 0) return monitorCompare
}
const workspaceCompare = a.workspace.id - b.workspace.id
if (workspaceCompare !== 0) return workspaceCompare
}
return 0
})
}
// Signals for workspace changes that WorkspaceSwitcher can connect to
signal workspacesUpdated()
signal focusedWorkspaceUpdated()
signal focusedMonitorUpdated()
// Monitor changes to properties and emit our signals
onAllWorkspacesChanged: workspacesUpdated()
onFocusedWorkspaceChanged: focusedWorkspaceUpdated()
onFocusedMonitorChanged: focusedMonitorUpdated()
}