1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-06-08 04:09:15 -04:00

fix(wallpaper): external management toggle & partial monitor DPMS recovery

Fixes #2579, #2581
This commit is contained in:
purian23
2026-06-05 19:36:23 -04:00
parent e50ac208e3
commit 4d0aab773b
2 changed files with 21 additions and 2 deletions
+3
View File
@@ -2241,6 +2241,9 @@ Singleton {
function getFilteredScreens(componentId) { function getFilteredScreens(componentId) {
var prefs = screenPreferences && screenPreferences[componentId] || ["all"]; var prefs = screenPreferences && screenPreferences[componentId] || ["all"];
if (componentId === "wallpaper" && Array.isArray(prefs) && prefs.length === 0) {
return [];
}
if (!prefs || prefs.length === 0 || prefs.includes("all") || (typeof prefs[0] === "string" && prefs[0] === "all")) { if (!prefs || prefs.length === 0 || prefs.includes("all") || (typeof prefs[0] === "string" && prefs[0] === "all")) {
return Quickshell.screens; return Quickshell.screens;
} }
+18 -2
View File
@@ -328,6 +328,16 @@ Item {
} }
property bool hadRealScreen: true property bool hadRealScreen: true
property var previousRealScreenNames: []
function _getRealScreenNames() {
const names = [];
for (let i = 0; i < Quickshell.screens.length; i++) {
if (Quickshell.screens[i].name.length > 0)
names.push(Quickshell.screens[i].name);
}
return names;
}
function _hasRealScreen() { function _hasRealScreen() {
for (let i = 0; i < Quickshell.screens.length; i++) { for (let i = 0; i < Quickshell.screens.length; i++) {
@@ -353,14 +363,20 @@ Item {
target: Quickshell target: Quickshell
function onScreensChanged() { function onScreensChanged() {
const hasReal = root._hasRealScreen(); const hasReal = root._hasRealScreen();
const currentNames = root._getRealScreenNames();
log.info("Screens changed:", Quickshell.screens.length, log.info("Screens changed:", Quickshell.screens.length,
Quickshell.screens.map(s => "'" + s.name + "'").join(","), Quickshell.screens.map(s => "'" + s.name + "'").join(","),
"hasReal:", hasReal, "hadReal:", root.hadRealScreen); "hasReal:", hasReal, "hadReal:", root.hadRealScreen);
if (!root.hadRealScreen && hasReal) { const fullReconnect = !root.hadRealScreen && hasReal;
log.info("Real screen reappeared after placeholder state, triggering surface recovery"); const partialReconnect = root.previousRealScreenNames.length > 0
&& currentNames.some(name => !root.previousRealScreenNames.includes(name));
if (fullReconnect || partialReconnect) {
log.info("Screen reconnect detected, triggering surface recovery",
"full:", fullReconnect, "partial:", partialReconnect);
root.triggerSurfaceRecovery("screen-reconnect"); root.triggerSurfaceRecovery("screen-reconnect");
} }
root.hadRealScreen = hasReal; root.hadRealScreen = hasReal;
root.previousRealScreenNames = currentNames;
} }
} }