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

wallpaper: fix per-monitor view modes

Browse Source 
fixes #1582
This commit is contained in:
bbedward
2026-02-11 17:58:44 -05:00
parent 0133c19276
commit 1a9d7684b9
7 changed files with 143 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
quickshell/Common/SessionData.qml
View File

@@ -58,6 +58,7 @@ Singleton {
property string wallpaperPathDark: ""
property var monitorWallpapersLight: ({})
property var monitorWallpapersDark: ({})
property var monitorWallpaperFillModes: ({})
property string wallpaperTransition: "fade"
readonly property var availableWallpaperTransitions: ["none", "fade", "wipe", "disc", "stripes", "iris bloom", "pixelate", "portal"]
property var includedTransitions: availableWallpaperTransitions.filter(t => t !== "none")
@@ -1094,11 +1095,7 @@ Singleton {
wallpaperPath = isLightMode ? wallpaperPathLight : wallpaperPathDark;
}
function getMonitorWallpaper(screenName) {
if (!perMonitorWallpaper) {
return wallpaperPath;
}
function _findMonitorValue(map, screenName) {
var screen = null;
var screens = Quickshell.screens;
for (var i = 0; i < screens.length; i++) {
@@ -1108,52 +1105,72 @@ Singleton {
}
}
if (!screen) {
return monitorWallpapers[screenName] || wallpaperPath;
if (!screen)
return map[screenName];
if (map[screen.name] !== undefined)
return map[screen.name];
if (screen.model && map[screen.model] !== undefined)
return map[screen.model];
if (typeof SettingsData !== "undefined") {
var displayName = SettingsData.getScreenDisplayName(screen);
if (displayName && map[displayName] !== undefined)
return map[displayName];
}
return undefined;
}
function getMonitorWallpaper(screenName) {
if (!perMonitorWallpaper)
return wallpaperPath;
var value = _findMonitorValue(monitorWallpapers, screenName);
return value !== undefined ? value : wallpaperPath;
}
function getMonitorWallpaperFillMode(screenName) {
var globalFillMode = (typeof SettingsData !== "undefined") ? SettingsData.wallpaperFillMode : "Fill";
if (!perMonitorWallpaper)
return globalFillMode;
var value = _findMonitorValue(monitorWallpaperFillModes, screenName);
return value !== undefined ? value : globalFillMode;
}
function setMonitorWallpaperFillMode(screenName, mode) {
var screen = null;
var screens = Quickshell.screens;
for (var i = 0; i < screens.length; i++) {
if (screens[i].name === screenName) {
screen = screens[i];
break;
}
}
if (monitorWallpapers[screen.name]) {
return monitorWallpapers[screen.name];
}
if (screen.model && monitorWallpapers[screen.model]) {
return monitorWallpapers[screen.model];
if (!screen)
return;
var identifier = typeof SettingsData !== "undefined" ? SettingsData.getScreenDisplayName(screen) : screen.name;
var newModes = {};
for (var key in monitorWallpaperFillModes) {
var isThisScreen = key === screen.name || (screen.model && key === screen.model);
if (!isThisScreen)
newModes[key] = monitorWallpaperFillModes[key];
}
return wallpaperPath;
newModes[identifier] = mode;
monitorWallpaperFillModes = newModes;
saveSettings();
}
function getMonitorCyclingSettings(screenName) {
var screen = null;
var screens = Quickshell.screens;
for (var i = 0; i < screens.length; i++) {
if (screens[i].name === screenName) {
screen = screens[i];
break;
}
}
if (!screen) {
return monitorCyclingSettings[screenName] || {
"enabled": false,
"mode": "interval",
"interval": 300,
"time": "06:00"
};
}
if (monitorCyclingSettings[screen.name]) {
return monitorCyclingSettings[screen.name];
}
if (screen.model && monitorCyclingSettings[screen.model]) {
return monitorCyclingSettings[screen.model];
}
return {
var defaults = {
"enabled": false,
"mode": "interval",
"interval": 300,
"time": "06:00"
};
var value = _findMonitorValue(monitorCyclingSettings, screenName);
return value !== undefined ? value : defaults;
}
FileView {

20
quickshell/Common/Theme.qml
View File

@@ -45,11 +45,12 @@ Singleton {
if (typeof SessionData === "undefined")
return "";
var monitors = SessionData.monitorWallpapers;
if (SessionData.perMonitorWallpaper) {
var screens = Quickshell.screens;
if (screens.length > 0) {
var firstMonitorWallpaper = SessionData.getMonitorWallpaper(screens[0].name);
return firstMonitorWallpaper || SessionData.wallpaperPath;
var s = screens[0];
return monitors[s.name] || (s.model ? monitors[s.model] : "") || SessionData.wallpaperPath;
}
}
@@ -59,6 +60,7 @@ Singleton {
if (typeof SessionData === "undefined")
return "";
var monitors = SessionData.monitorWallpapers;
if (SessionData.perMonitorWallpaper) {
var screens = Quickshell.screens;
if (screens.length > 0) {
@@ -72,12 +74,20 @@ Singleton {
}
}
if (!targetMonitorExists) {
if (!targetMonitorExists)
targetMonitor = screens[0].name;
var s = null;
for (var j = 0; j < screens.length; j++) {
if (screens[j].name === targetMonitor) {
s = screens[j];
break;
}
}
var targetMonitorWallpaper = SessionData.getMonitorWallpaper(targetMonitor);
return targetMonitorWallpaper || SessionData.wallpaperPath;
if (s)
return monitors[s.name] || (s.model ? monitors[s.model] : "") || SessionData.wallpaperPath;
return monitors[targetMonitor] || SessionData.wallpaperPath;
}
}

1
quickshell/Common/settings/SessionSpec.js
View File

@@ -12,6 +12,7 @@ var SPEC = {
wallpaperPathDark: { def: "" },
monitorWallpapersLight: { def: {} },
monitorWallpapersDark: { def: {} },
monitorWallpaperFillModes: { def: {} },
wallpaperTransition: { def: "fade" },
includedTransitions: { def: ["fade", "wipe", "disc", "stripes", "iris bloom", "pixelate", "portal"] },