Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-04-09 23:32:10 -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

4
quickshell/Modules/BlurredWallpaperBackground.qml
View File

@@ -189,7 +189,7 @@ Variants {
smooth: true
cache: true
sourceSize: Qt.size(root.textureWidth, root.textureHeight)
fillMode: root.getFillMode(SessionData.isGreeterMode ? GreetdSettings.wallpaperFillMode : SettingsData.wallpaperFillMode)
fillMode: root.getFillMode(SessionData.isGreeterMode ? GreetdSettings.wallpaperFillMode : SessionData.getMonitorWallpaperFillMode(modelData.name))
}
Image {
@@ -201,7 +201,7 @@ Variants {
smooth: true
cache: true
sourceSize: Qt.size(root.textureWidth, root.textureHeight)
fillMode: root.getFillMode(SessionData.isGreeterMode ? GreetdSettings.wallpaperFillMode : SettingsData.wallpaperFillMode)
fillMode: root.getFillMode(SessionData.isGreeterMode ? GreetdSettings.wallpaperFillMode : SessionData.getMonitorWallpaperFillMode(modelData.name))
onStatusChanged: {
if (status !== Image.Ready)

2
quickshell/Modules/Lock/LockScreenContent.qml
View File

@@ -166,7 +166,7 @@ Item {
var currentWallpaper = SessionData.getMonitorWallpaper(screenName);
return (currentWallpaper && !currentWallpaper.startsWith("#")) ? encodeFileUrl(currentWallpaper) : "";
}
fillMode: Theme.getFillMode(SettingsData.wallpaperFillMode)
fillMode: Theme.getFillMode(SessionData.getMonitorWallpaperFillMode(screenName))
smooth: true
asynchronous: false
cache: true

122
quickshell/Modules/Settings/WallpaperTab.qml
View File

@@ -18,6 +18,26 @@ Item {
var screens = Quickshell.screens;
return screens.length > 0 ? screens[0].name : "";
}
property string currentWallpaper: {
if (!SessionData.perMonitorWallpaper)
return SessionData.wallpaperPath;
var map = SessionData.monitorWallpapers;
var screens = Quickshell.screens;
for (var i = 0; i < screens.length; i++) {
if (screens[i].name !== selectedMonitorName)
continue;
var screen = screens[i];
if (map[screen.name] !== undefined)
return map[screen.name];
if (screen.model && map[screen.model] !== undefined)
return map[screen.model];
var displayName = SettingsData.getScreenDisplayName(screen);
if (displayName && map[displayName] !== undefined)
return map[displayName];
break;
}
return SessionData.wallpaperPath;
}
Component.onCompleted: {
WallpaperCyclingService.cyclingActive;
@@ -55,19 +75,22 @@ Item {
radius: Theme.cornerRadius
color: Theme.surfaceVariant
CachingImage {
Image {
anchors.fill: parent
anchors.margins: 1
imagePath: {
var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath;
return (currentWallpaper !== "" && !currentWallpaper.startsWith("#")) ? currentWallpaper : "";
source: {
var wp = root.currentWallpaper;
if (wp === "" || wp.startsWith("#"))
return "";
if (wp.startsWith("file://"))
wp = wp.substring(7);
return "file://" + wp.split('/').map(s => encodeURIComponent(s)).join('/');
}
fillMode: Image.PreserveAspectCrop
visible: {
var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath;
return currentWallpaper !== "" && !currentWallpaper.startsWith("#");
}
maxCacheSize: 160
visible: root.currentWallpaper !== "" && !root.currentWallpaper.startsWith("#")
sourceSize.width: 160
sourceSize.height: 160
asynchronous: true
layer.enabled: true
layer.effect: MultiEffect {
maskEnabled: true
@@ -81,14 +104,8 @@ Item {
anchors.fill: parent
anchors.margins: 1
radius: Theme.cornerRadius - 1
color: {
var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath;
return currentWallpaper.startsWith("#") ? currentWallpaper : "transparent";
}
visible: {
var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath;
return currentWallpaper !== "" && currentWallpaper.startsWith("#");
}
color: root.currentWallpaper.startsWith("#") ? root.currentWallpaper : "transparent"
visible: root.currentWallpaper !== "" && root.currentWallpaper.startsWith("#")
}
Rectangle {
@@ -106,10 +123,7 @@ Item {
name: "image"
size: Theme.iconSizeLarge + 8
color: Theme.surfaceVariantText
visible: {
var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath;
return currentWallpaper === "";
}
visible: root.currentWallpaper === ""
}
Rectangle {
@@ -162,8 +176,7 @@ Item {
onClicked: {
if (!PopoutService.colorPickerModal)
return;
var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath;
PopoutService.colorPickerModal.selectedColor = currentWallpaper.startsWith("#") ? currentWallpaper : Theme.primary;
PopoutService.colorPickerModal.selectedColor = root.currentWallpaper.startsWith("#") ? root.currentWallpaper : Theme.primary;
PopoutService.colorPickerModal.pickerTitle = "Choose Wallpaper Color";
PopoutService.colorPickerModal.onColorSelectedCallback = function (selectedColor) {
if (SessionData.perMonitorWallpaper) {
@@ -182,10 +195,7 @@ Item {
height: 32
radius: 16
color: Qt.rgba(255, 255, 255, 0.9)
visible: {
var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath;
return currentWallpaper !== "";
}
visible: root.currentWallpaper !== ""
DankIcon {
anchors.centerIn: parent
@@ -227,10 +237,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter
StyledText {
text: {
var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath;
return currentWallpaper ? currentWallpaper.split('/').pop() : "No wallpaper selected";
}
text: root.currentWallpaper ? root.currentWallpaper.split('/').pop() : "No wallpaper selected"
font.pixelSize: Theme.fontSizeLarge
color: Theme.surfaceText
elide: Text.ElideMiddle
@@ -240,39 +247,27 @@ Item {
}
StyledText {
text: {
var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath;
return currentWallpaper ? currentWallpaper : "";
}
text: root.currentWallpaper
font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceVariantText
elide: Text.ElideMiddle
maximumLineCount: 1
width: parent.width
horizontalAlignment: Text.AlignLeft
visible: {
var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath;
return currentWallpaper !== "";
}
visible: root.currentWallpaper !== ""
}
Row {
anchors.left: parent.left
spacing: Theme.spacingS
layoutDirection: I18n.isRtl ? Qt.RightToLeft : Qt.LeftToRight
visible: {
var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath;
return currentWallpaper !== "";
}
visible: root.currentWallpaper !== ""
DankActionButton {
buttonSize: 32
iconName: "skip_previous"
iconSize: Theme.iconSizeSmall
enabled: {
var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath;
return currentWallpaper && !currentWallpaper.startsWith("#") && !currentWallpaper.startsWith("we");
}
enabled: root.currentWallpaper && !root.currentWallpaper.startsWith("#") && !root.currentWallpaper.startsWith("we")
opacity: enabled ? 1 : 0.5
backgroundColor: Theme.surfaceContainerHigh
iconColor: Theme.surfaceText
@@ -289,10 +284,7 @@ Item {
buttonSize: 32
iconName: "skip_next"
iconSize: Theme.iconSizeSmall
enabled: {
var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath;
return currentWallpaper && !currentWallpaper.startsWith("#") && !currentWallpaper.startsWith("we");
}
enabled: root.currentWallpaper && !root.currentWallpaper.startsWith("#") && !root.currentWallpaper.startsWith("we")
opacity: enabled ? 1 : 0.5
backgroundColor: Theme.surfaceContainerHigh
iconColor: Theme.surfaceText
@@ -311,10 +303,7 @@ Item {
Item {
width: parent.width
height: fillModeGroup.height
visible: {
var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath;
return currentWallpaper !== "" && !currentWallpaper.startsWith("#");
}
visible: root.currentWallpaper !== "" && !root.currentWallpaper.startsWith("#")
DankButtonGroup {
id: fillModeGroup
@@ -329,20 +318,39 @@ Item {
textSize: Theme.fontSizeSmall
checkEnabled: false
currentIndex: {
return internalModes.indexOf(SettingsData.wallpaperFillMode);
var mode = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaperFillMode(selectedMonitorName) : SettingsData.wallpaperFillMode;
return internalModes.indexOf(mode);
}
onSelectionChanged: (index, selected) => {
if (!selected)
return;
SettingsData.set("wallpaperFillMode", internalModes[index]);
if (SessionData.perMonitorWallpaper) {
SessionData.setMonitorWallpaperFillMode(selectedMonitorName, internalModes[index]);
} else {
SettingsData.set("wallpaperFillMode", internalModes[index]);
}
}
Connections {
target: SettingsData
function onWallpaperFillModeChanged() {
if (SessionData.perMonitorWallpaper)
return;
fillModeGroup.currentIndex = fillModeGroup.internalModes.indexOf(SettingsData.wallpaperFillMode);
}
}
Connections {
target: root
function onSelectedMonitorNameChanged() {
if (!SessionData.perMonitorWallpaper)
return;
fillModeGroup.currentIndex = Qt.binding(() => {
var mode = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaperFillMode(selectedMonitorName) : SettingsData.wallpaperFillMode;
return fillModeGroup.internalModes.indexOf(mode);
});
}
}
}
}

6
quickshell/Modules/WallpaperBackground.qml
View File

@@ -71,7 +71,7 @@ Variants {
}
property real transitionProgress: 0
property real shaderFillMode: getFillMode(SettingsData.wallpaperFillMode)
property real shaderFillMode: getFillMode(SessionData.getMonitorWallpaperFillMode(modelData.name))
property vector4d fillColor: Qt.vector4d(0, 0, 0, 1)
property real edgeSmoothness: 0.1
@@ -236,7 +236,7 @@ Variants {
smooth: true
cache: true
sourceSize: Qt.size(root.textureWidth, root.textureHeight)
fillMode: root.getFillMode(SettingsData.wallpaperFillMode)
fillMode: root.getFillMode(SessionData.getMonitorWallpaperFillMode(modelData.name))
}
Image {
@@ -249,7 +249,7 @@ Variants {
smooth: true
cache: true
sourceSize: Qt.size(root.textureWidth, root.textureHeight)
fillMode: root.getFillMode(SettingsData.wallpaperFillMode)
fillMode: root.getFillMode(SessionData.getMonitorWallpaperFillMode(modelData.name))
onStatusChanged: {
if (status !== Image.Ready)