Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-10-18 09:14:01 -04:00
Code Packages Releases Activity

hyprland: use focusedMonitor instead of focusedWorkspace.monitor (#3424)

Browse Source 
Hyprland's workspace refactor (hyprwm/Hyprland#16140) broke
Hyprland.focusedWorkspace.monitor as a way to find the focused screen
(quickshell-mirror/quickshell#1119). Quickshell already exposes
Hyprland.focusedMonitor directly, so read the monitor from there
This commit is contained in:
Timofey
2026-09-14 14:31:40 -04:00
committed by GitHub
parent 218f7f752f
commit 05c807b7cd
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/DMSShellIPC.qml
+2 -2
View File
@@ -420,8 +420,8 @@ Item {
IpcHandler {
function getFocusedScreenName() {
if (CompositorService.isHyprland && Hyprland.focusedWorkspace && Hyprland.focusedWorkspace.monitor) {
return Hyprland.focusedWorkspace.monitor.name;
if (CompositorService.isHyprland && Hyprland.focusedMonitor) {
return Hyprland.focusedMonitor.name;
}
if (CompositorService.isNiri && NiriService.currentOutput) {
return NiriService.currentOutput;
quickshell/Modules/DankBar/DankBar.qml
+4 -4
View File
@@ -103,8 +103,8 @@ Item {
function triggerControlCenterOnFocusedScreen() {
let focusedScreenName = "";
if (CompositorService.isHyprland && Hyprland.focusedWorkspace && Hyprland.focusedWorkspace.monitor) {
focusedScreenName = Hyprland.focusedWorkspace.monitor.name;
if (CompositorService.isHyprland && Hyprland.focusedMonitor) {
focusedScreenName = Hyprland.focusedMonitor.name;
} else if (CompositorService.isNiri && NiriService.currentOutput) {
focusedScreenName = NiriService.currentOutput;
} else if (CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle) {
@@ -132,8 +132,8 @@ Item {
function triggerWallpaperBrowserOnFocusedScreen() {
let focusedScreenName = "";
if (CompositorService.isHyprland && Hyprland.focusedWorkspace && Hyprland.focusedWorkspace.monitor) {
focusedScreenName = Hyprland.focusedWorkspace.monitor.name;
if (CompositorService.isHyprland && Hyprland.focusedMonitor) {
focusedScreenName = Hyprland.focusedMonitor.name;
} else if (CompositorService.isNiri && NiriService.currentOutput) {
focusedScreenName = NiriService.currentOutput;
} else if (CompositorService.isSway || CompositorService.isScroll || CompositorService.isMiracle) {
quickshell/Modules/DankBar/Widgets/NotepadButton.qml
+1 -1
View File
@@ -10,7 +10,7 @@ import qs.Widgets
BasePill {
id: root
readonly property string focusedScreenName: (CompositorService.isHyprland && typeof Hyprland !== "undefined" && Hyprland.focusedWorkspace && Hyprland.focusedWorkspace.monitor ? (Hyprland.focusedWorkspace.monitor.name || "") : CompositorService.isNiri && typeof NiriService !== "undefined" && NiriService.currentOutput ? NiriService.currentOutput : "")
readonly property string focusedScreenName: (CompositorService.isHyprland && typeof Hyprland !== "undefined" && Hyprland.focusedMonitor ? (Hyprland.focusedMonitor.name || "") : CompositorService.isNiri && typeof NiriService !== "undefined" && NiriService.currentOutput ? NiriService.currentOutput : "")
readonly property string targetScreenName: parentScreen?.name || focusedScreenName
function resolveNotepadInstance() {
quickshell/Services/BarWidgetService.qml
+2 -2
View File
@@ -140,8 +140,8 @@ Singleton {
function getFocusedScreenName() {
if (CompositorService.isAqueous && AqueousService.available)
return AqueousService.focusedOutput;
if (CompositorService.isHyprland && Hyprland.focusedWorkspace?.monitor)
return Hyprland.focusedWorkspace.monitor.name;
if (CompositorService.isHyprland && Hyprland.focusedMonitor)
return Hyprland.focusedMonitor.name;
if (CompositorService.isNiri && NiriService.currentOutput)
return NiriService.currentOutput;
if (CompositorService.isMango && MangoService.activeOutput)
quickshell/Services/CompositorService.qml
+2 -2
View File
@@ -202,8 +202,8 @@ Singleton {
let screenName = "";
if (isAqueous && AqueousService.available)
screenName = AqueousService.focusedOutput;
else if (isHyprland && Hyprland.focusedWorkspace?.monitor)
screenName = Hyprland.focusedWorkspace.monitor.name;
else if (isHyprland && Hyprland.focusedMonitor)
screenName = Hyprland.focusedMonitor.name;
else if (isNiri && NiriService.currentOutput)
screenName = NiriService.currentOutput;
else if (isSway || isScroll || isMiracle) {