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

fix(settings): fix text truncation in some section of settings and update icons (#2618)

* fixed spacing issues

* added one missing icon and replaced two
This commit is contained in:
Youseffo13
2026-06-11 21:35:51 +02:00
committed by GitHub
parent 573785d4ce
commit 29e8470f2e
7 changed files with 19 additions and 5 deletions
+1 -1
View File
@@ -722,7 +722,7 @@ Item {
SettingsCard { SettingsCard {
width: parent.width width: parent.width
iconName: "system_tray" iconName: "handyman"
title: I18n.tr("Tray Icon Fix") title: I18n.tr("Tray Icon Fix")
visible: DesktopService.isSystemd visible: DesktopService.isSystemd
@@ -1754,6 +1754,9 @@ Item {
text: I18n.tr("Y Axis") text: I18n.tr("Y Axis")
description: I18n.tr("Action performed when scrolling vertically on the bar") description: I18n.tr("Action performed when scrolling vertically on the bar")
model: CompositorService.isNiri ? [I18n.tr("None"), I18n.tr("Workspace"), I18n.tr("Column")] : [I18n.tr("None"), I18n.tr("Workspace")] model: CompositorService.isNiri ? [I18n.tr("None"), I18n.tr("Workspace"), I18n.tr("Column")] : [I18n.tr("None"), I18n.tr("Workspace")]
buttonPadding: Theme.spacingS
minButtonWidth: 44
textSize: Theme.fontSizeSmall
currentIndex: { currentIndex: {
switch (selectedBarConfig?.scrollYBehavior || "workspace") { switch (selectedBarConfig?.scrollYBehavior || "workspace") {
case "none": case "none":
@@ -1792,6 +1795,9 @@ Item {
description: I18n.tr("Action performed when scrolling horizontally on the bar") description: I18n.tr("Action performed when scrolling horizontally on the bar")
visible: CompositorService.isNiri visible: CompositorService.isNiri
model: [I18n.tr("None"), I18n.tr("Workspace"), I18n.tr("Column")] model: [I18n.tr("None"), I18n.tr("Workspace"), I18n.tr("Column")]
buttonPadding: Theme.spacingS
minButtonWidth: 44
textSize: Theme.fontSizeSmall
currentIndex: { currentIndex: {
switch (selectedBarConfig?.scrollXBehavior || "column") { switch (selectedBarConfig?.scrollXBehavior || "column") {
case "none": case "none":
+3
View File
@@ -205,6 +205,9 @@ Item {
tags: ["frame", "border", "color", "theme", "primary", "surface", "default"] tags: ["frame", "border", "color", "theme", "primary", "surface", "default"]
text: I18n.tr("Border Color") text: I18n.tr("Border Color")
model: [I18n.tr("Default"), I18n.tr("Primary"), I18n.tr("Surface"), I18n.tr("Custom")] model: [I18n.tr("Default"), I18n.tr("Primary"), I18n.tr("Surface"), I18n.tr("Custom")]
buttonPadding: Theme.spacingS
minButtonWidth: 44
textSize: Theme.fontSizeSmall
currentIndex: { currentIndex: {
const fc = SettingsData.frameColor; const fc = SettingsData.frameColor;
if (!fc || fc === "default") if (!fc || fc === "default")
@@ -2681,7 +2681,7 @@ Item {
spacing: Theme.spacingS spacing: Theme.spacingS
DankIcon { DankIcon {
name: "folder" name: "settings"
size: 16 size: 16
color: Theme.primary color: Theme.primary
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@@ -1271,6 +1271,7 @@ Item {
tags: ["blur", "layer", "niri", "compositor"] tags: ["blur", "layer", "niri", "compositor"]
title: I18n.tr("Blur Wallpaper Layer") title: I18n.tr("Blur Wallpaper Layer")
settingKey: "blurWallpaper" settingKey: "blurWallpaper"
iconName: "blur_on"
visible: CompositorService.isNiri visible: CompositorService.isNiri
SettingsToggleRow { SettingsToggleRow {
@@ -330,7 +330,7 @@ FloatingWindow {
delegate: Rectangle { delegate: Rectangle {
width: widgetList.width width: widgetList.width
height: 60 height: Math.max(60, textColumn.implicitHeight + 24)
radius: Theme.cornerRadius radius: Theme.cornerRadius
property bool isSelected: root.keyboardNavigationActive && index === root.selectedIndex property bool isSelected: root.keyboardNavigationActive && index === root.selectedIndex
color: isSelected ? Theme.withAlpha(Theme.primary, root.blurActive ? 0.22 : 0.16) : widgetArea.containsMouse ? Theme.withAlpha(Theme.primary, root.blurActive ? 0.14 : 0.08) : Theme.withAlpha(Theme.surfaceVariant, root.rowAlpha) color: isSelected ? Theme.withAlpha(Theme.primary, root.blurActive ? 0.22 : 0.16) : widgetArea.containsMouse ? Theme.withAlpha(Theme.primary, root.blurActive ? 0.14 : 0.08) : Theme.withAlpha(Theme.surfaceVariant, root.rowAlpha)
@@ -351,9 +351,10 @@ FloatingWindow {
} }
Column { Column {
id: textColumn
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
spacing: 2 spacing: 2
width: parent.width - Theme.iconSize - Theme.spacingM * 3 width: parent.width - Theme.iconSize * 2 - Theme.spacingM * 4 + 4
StyledText { StyledText {
text: modelData.text text: modelData.text
@@ -362,6 +363,7 @@ FloatingWindow {
color: Theme.surfaceText color: Theme.surfaceText
elide: Text.ElideRight elide: Text.ElideRight
width: parent.width width: parent.width
wrapMode: Text.WordWrap
} }
StyledText { StyledText {
@@ -90,7 +90,7 @@ Column {
property real originalY: y property real originalY: y
width: itemsList.width width: itemsList.width
height: 70 height: Math.max(70, textColumn.implicitHeight + 32)
z: held ? 2 : 1 z: held ? 2 : 1
Rectangle { Rectangle {
@@ -123,6 +123,7 @@ Column {
} }
Column { Column {
id: textColumn
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: Theme.spacingM * 3 + 40 + Theme.iconSize anchors.leftMargin: Theme.spacingM * 3 + 40 + Theme.iconSize
anchors.right: actionButtons.left anchors.right: actionButtons.left
@@ -137,6 +138,7 @@ Column {
color: modelData.enabled ? Theme.surfaceText : Theme.outline color: modelData.enabled ? Theme.surfaceText : Theme.outline
elide: Text.ElideRight elide: Text.ElideRight
width: parent.width width: parent.width
wrapMode: Text.WordWrap
} }
StyledText { StyledText {