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

animations: fix regression eliding button group text caused by recently

Browse Source 
RTL fixes
fixes #2741
This commit is contained in:
bbedward
2026-07-04 10:44:02 -04:00
parent 19b44b1782
commit 8cb4e21716
5 changed files with 184 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Modules/Settings/WallpaperTab.qml
+29 -101
View File
@@ -300,111 +300,39 @@ Item {
}
}
Item {
width: parent.width
height: fillModeColumn.height
SettingsDropdownRow {
id: fillModeRow
readonly property var fillModes: ["Stretch", "Fit", "Fill", "Scrolling", "Tile", "TileVertically", "TileHorizontally", "Pad"]
readonly property var fillModeLabels: [I18n.tr("Stretch", "wallpaper fill mode"), I18n.tr("Fit", "wallpaper fill mode"), I18n.tr("Fill", "wallpaper fill mode"), I18n.tr("Scroll", "wallpaper fill mode"), I18n.tr("Tile", "wallpaper fill mode"), I18n.tr("Tile Vertically", "wallpaper fill mode"), I18n.tr("Tile Horizontally", "wallpaper fill mode"), I18n.tr("Pad", "wallpaper fill mode")]
tab: "wallpaper"
tags: ["background", "fill", "fit", "stretch", "tile", "scale"]
settingKey: "wallpaperFillMode"
text: I18n.tr("Fill Mode", "wallpaper fill mode setting")
description: I18n.tr("How the wallpaper is scaled to fit the screen")
visible: root.currentWallpaper !== "" && !root.currentWallpaper.startsWith("#")
Column {
id: fillModeColumn
anchors.horizontalCenter: parent.horizontalCenter
spacing: Theme.spacingS
property var firstRowModes: ["Stretch", "Fit", "Fill", "Scrolling"]
property var secondRowModes: ["Tile", "TileVertically", "TileHorizontally", "Pad"]
function currentMode() {
return SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaperFillMode(selectedMonitorName) : SettingsData.wallpaperFillMode;
}
function selectMode(mode) {
if (SessionData.perMonitorWallpaper) {
SessionData.setMonitorWallpaperFillMode(selectedMonitorName, mode);
} else {
SettingsData.set("wallpaperFillMode", mode);
}
}
DankButtonGroup {
id: fillModeGroupFirstRow
property var internalModes: fillModeColumn.firstRowModes
anchors.horizontalCenter: parent.horizontalCenter
model: [I18n.tr("Stretch", "wallpaper fill mode"), I18n.tr("Fit", "wallpaper fill mode"), I18n.tr("Fill", "wallpaper fill mode"), I18n.tr("Scroll", "wallpaper fill mode")]
selectionMode: "single"
buttonHeight: 28
minButtonWidth: 48
buttonPadding: Theme.spacingS
checkIconSize: 0
textSize: Theme.fontSizeSmall
checkEnabled: false
currentIndex: {
var mode = fillModeColumn.currentMode();
var idx = internalModes.indexOf(mode);
return idx >= 0 ? idx : -1;
}
onSelectionChanged: (index, selected) => {
if (!selected)
return;
fillModeColumn.selectMode(internalModes[index]);
}
}
DankButtonGroup {
id: fillModeGroupSecondRow
property var internalModes: fillModeColumn.secondRowModes
anchors.horizontalCenter: parent.horizontalCenter
model: [I18n.tr("Tile", "wallpaper fill mode"), I18n.tr("Tile V", "wallpaper fill mode"), I18n.tr("Tile H", "wallpaper fill mode"), I18n.tr("Pad", "wallpaper fill mode")]
selectionMode: "single"
buttonHeight: 28
minButtonWidth: 48
buttonPadding: Theme.spacingS
checkIconSize: 0
textSize: Theme.fontSizeSmall
checkEnabled: false
currentIndex: {
var mode = fillModeColumn.currentMode();
var idx = internalModes.indexOf(mode);
return idx >= 0 ? idx : -1;
}
onSelectionChanged: (index, selected) => {
if (!selected)
return;
fillModeColumn.selectMode(internalModes[index]);
}
dropdownWidth: 190
options: fillModeLabels
optionIcons: ["aspect_ratio", "fit_screen", "zoom_out_map", "swipe", "grid_view", "view_agenda", "view_column", "padding"]
onValueChanged: value => {
const idx = fillModeLabels.indexOf(value);
if (idx < 0)
return;
if (SessionData.perMonitorWallpaper) {
SessionData.setMonitorWallpaperFillMode(root.selectedMonitorName, fillModes[idx]);
} else {
SettingsData.set("wallpaperFillMode", fillModes[idx]);
}
}
Connections {
target: SettingsData
function onWallpaperFillModeChanged() {
if (SessionData.perMonitorWallpaper)
return;
fillModeGroupFirstRow.currentIndex = Qt.binding(() => {
var idx = fillModeGroupFirstRow.internalModes.indexOf(SettingsData.wallpaperFillMode);
return idx >= 0 ? idx : -1;
});
fillModeGroupSecondRow.currentIndex = Qt.binding(() => {
var idx = fillModeGroupSecondRow.internalModes.indexOf(SettingsData.wallpaperFillMode);
return idx >= 0 ? idx : -1;
});
}
}
Connections {
target: root
function onSelectedMonitorNameChanged() {
if (!SessionData.perMonitorWallpaper)
return;
fillModeGroupFirstRow.currentIndex = Qt.binding(() => {
var mode = SessionData.getMonitorWallpaperFillMode(selectedMonitorName);
var idx = fillModeGroupFirstRow.internalModes.indexOf(mode);
return idx >= 0 ? idx : -1;
});
fillModeGroupSecondRow.currentIndex = Qt.binding(() => {
var mode = SessionData.getMonitorWallpaperFillMode(selectedMonitorName);
var idx = fillModeGroupSecondRow.internalModes.indexOf(mode);
return idx >= 0 ? idx : -1;
});
Binding {
target: fillModeRow
property: "currentValue"
value: {
const mode = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaperFillMode(root.selectedMonitorName) : SettingsData.wallpaperFillMode;
const idx = fillModeRow.fillModes.indexOf(mode);
return idx >= 0 ? fillModeRow.fillModeLabels[idx] : "";
}
}
}