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

workspaces: fix hardcoded font weight to use configured value

Browse Source 
fixes #2076
This commit is contained in:
bbedward
2026-07-03 12:10:45 -04:00
parent 61108b7668
commit 8e7126472e
5 changed files with 125 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
+4 -4
View File
@@ -1629,7 +1629,7 @@ Item {
text: loadedIconData?.value ?? ""
color: (isActive || isUrgent) ? Theme.withAlpha(Theme.surfaceContainer, 0.95) : isPlaceholder ? Theme.surfaceTextAlpha : Theme.surfaceTextMedium
font.pixelSize: Theme.barTextSize(barThickness, barConfig?.fontScale, barConfig?.maximizeWidgetText)
font.weight: (isActive && !isPlaceholder) ? Font.DemiBold : Font.Normal
font.weight: (isActive && !isPlaceholder) ? Math.max(Theme.fontWeight, Font.DemiBold) : Theme.fontWeight
}
}
@@ -1644,7 +1644,7 @@ Item {
text: loadedHasIcon ? (modelData?.name ?? "") : root.getWorkspaceIndex(modelData, index)
color: (isActive || isUrgent) ? Theme.withAlpha(Theme.surfaceContainer, 0.95) : isPlaceholder ? Theme.surfaceTextAlpha : Theme.surfaceTextMedium
font.pixelSize: Theme.barTextSize(barThickness, barConfig?.fontScale, barConfig?.maximizeWidgetText)
font.weight: (isActive && !isPlaceholder) ? Font.DemiBold : Font.Normal
font.weight: (isActive && !isPlaceholder) ? Math.max(Theme.fontWeight, Font.DemiBold) : Theme.fontWeight
}
}
@@ -1805,7 +1805,7 @@ Item {
text: loadedIconData?.value ?? ""
color: (isActive || isUrgent) ? Theme.withAlpha(Theme.surfaceContainer, 0.95) : isPlaceholder ? Theme.surfaceTextAlpha : Theme.surfaceTextMedium
font.pixelSize: Theme.barTextSize(barThickness, barConfig?.fontScale, barConfig?.maximizeWidgetText)
font.weight: (isActive && !isPlaceholder) ? Font.DemiBold : Font.Normal
font.weight: (isActive && !isPlaceholder) ? Math.max(Theme.fontWeight, Font.DemiBold) : Theme.fontWeight
}
StyledText {
@@ -1814,7 +1814,7 @@ Item {
text: loadedHasIcon ? (root.isVertical ? (modelData?.name ?? "").charAt(0) : (modelData?.name ?? "")) : root.getWorkspaceIndex(modelData, index)
color: (isActive || isUrgent) ? Theme.withAlpha(Theme.surfaceContainer, 0.95) : isPlaceholder ? Theme.surfaceTextAlpha : Theme.surfaceTextMedium
font.pixelSize: Theme.barTextSize(barThickness, barConfig?.fontScale, barConfig?.maximizeWidgetText)
font.weight: (isActive && !isPlaceholder) ? Font.DemiBold : Font.Normal
font.weight: (isActive && !isPlaceholder) ? Math.max(Theme.fontWeight, Font.DemiBold) : Theme.fontWeight
}
Repeater {
quickshell/Modules/Settings/DankBarTab.qml
-4
View File
@@ -1133,10 +1133,6 @@ Item {
}
}
WorkspaceAppearanceCard {
visible: dankBarTab.appearanceOnly
}
SettingsCard {
tab: "appearance"
iconName: "rounded_corner"
quickshell/Modules/Settings/WorkspacesTab.qml
+4
View File
@@ -198,6 +198,10 @@ Item {
}
}
WorkspaceAppearanceCard {
width: parent.width
}
SettingsCard {
width: parent.width
iconName: "label"
quickshell/translations/extract_settings_index.py
+1 -1
View File
@@ -101,7 +101,7 @@ TAB_INDEX_MAP = {
"WindowRulesTab.qml": 38,
"DockTab.qml": 5,
"DankBarAppearanceTab.qml": 6,
"WorkspaceAppearanceCard.qml": 6,
"WorkspaceAppearanceCard.qml": 4,
"NetworkStatusTab.qml": 7,
"NetworkEthernetTab.qml": 39,
"NetworkWifiTab.qml": 40,
quickshell/translations/settings_search_index.json
+116 -116
View File
@@ -872,6 +872,57 @@
"description": "Drag workspace indicators to reorder them",
"conditionKey": "isNiri"
},
{
"section": "workspaceFocusedBorderEnabled",
"label": "Focused Border",
"tabIndex": 4,
"category": "Dank Bar",
"keywords": [
"around",
"bar",
"border",
"dank",
"desktop",
"focused",
"indicator",
"outline",
"panel",
"ring",
"show",
"statusbar",
"topbar",
"virtual",
"workspace"
],
"description": "Show an outline ring around the focused workspace indicator"
},
{
"section": "workspaceUnfocusedMonitorBorderEnabled",
"label": "Focused Border",
"tabIndex": 4,
"category": "Dank Bar",
"keywords": [
"around",
"bar",
"border",
"dank",
"desktop",
"display",
"focused",
"indicator",
"monitor",
"outline",
"panel",
"ring",
"show",
"statusbar",
"topbar",
"unfocused",
"virtual",
"workspace"
],
"description": "Show an outline ring around the focused workspace indicator"
},
{
"section": "workspaceFollowFocus",
"label": "Follow Monitor Focus",
@@ -1026,6 +1077,44 @@
"description": "Reverse workspace switch direction when scrolling over the bar",
"conditionKey": "isNiri"
},
{
"section": "workspaceUnfocusedMonitorSeparateAppearance",
"label": "Separate Appearance for Unfocused Display(s)",
"tabIndex": 4,
"category": "Dank Bar",
"keywords": [
"appearance",
"bar",
"color",
"colors",
"colour",
"colours",
"dank",
"desktop",
"different",
"display",
"display(s)",
"displays",
"focused",
"hue",
"monitor",
"monitors",
"output",
"outputs",
"palette",
"panel",
"screen",
"screens",
"separate",
"statusbar",
"tint",
"topbar",
"unfocused",
"virtual",
"workspace"
],
"description": "Use different workspace colors on displays that are not focused"
},
{
"section": "dwlShowAllTags",
"label": "Show All Tags",
@@ -1106,6 +1195,33 @@
"description": "Display application icons in workspace indicators",
"conditionKey": "isNiri"
},
{
"section": "workspaceAppearance",
"label": "Workspace Appearance",
"tabIndex": 4,
"category": "Dank Bar",
"keywords": [
"appearance",
"around",
"bar",
"color",
"custom",
"dank",
"desktop",
"focused",
"indicator",
"outline",
"panel",
"ring",
"show",
"statusbar",
"topbar",
"virtual",
"workspace"
],
"icon": "palette",
"description": "Show an outline ring around the focused workspace indicator"
},
{
"section": "showWorkspaceIndex",
"label": "Workspace Index Numbers",
@@ -1875,57 +1991,6 @@
],
"description": "Choose how this bar resolves shadow direction"
},
{
"section": "workspaceFocusedBorderEnabled",
"label": "Focused Border",
"tabIndex": 6,
"category": "Dank Bar",
"keywords": [
"around",
"bar",
"border",
"dank",
"desktop",
"focused",
"indicator",
"outline",
"panel",
"ring",
"show",
"statusbar",
"topbar",
"virtual",
"workspace"
],
"description": "Show an outline ring around the focused workspace indicator"
},
{
"section": "workspaceUnfocusedMonitorBorderEnabled",
"label": "Focused Border",
"tabIndex": 6,
"category": "Dank Bar",
"keywords": [
"around",
"bar",
"border",
"dank",
"desktop",
"display",
"focused",
"indicator",
"monitor",
"outline",
"panel",
"ring",
"show",
"statusbar",
"topbar",
"unfocused",
"virtual",
"workspace"
],
"description": "Show an outline ring around the focused workspace indicator"
},
{
"section": "barFontScale",
"label": "Font Scale",
@@ -2006,44 +2071,6 @@
"icon": "opacity",
"description": "Controls opacity of the bar background"
},
{
"section": "workspaceUnfocusedMonitorSeparateAppearance",
"label": "Separate Appearance for Unfocused Display(s)",
"tabIndex": 6,
"category": "Dank Bar",
"keywords": [
"appearance",
"bar",
"color",
"colors",
"colour",
"colours",
"dank",
"desktop",
"different",
"display",
"display(s)",
"displays",
"focused",
"hue",
"monitor",
"monitors",
"output",
"outputs",
"palette",
"panel",
"screen",
"screens",
"separate",
"statusbar",
"tint",
"topbar",
"unfocused",
"virtual",
"workspace"
],
"description": "Use different workspace colors on displays that are not focused"
},
{
"section": "barShadow",
"label": "Shadow Override",
@@ -2148,33 +2175,6 @@
"icon": "highlight",
"description": "Theme color used for the widget outline"
},
{
"section": "workspaceAppearance",
"label": "Workspace Appearance",
"tabIndex": 6,
"category": "Dank Bar",
"keywords": [
"appearance",
"around",
"bar",
"color",
"custom",
"dank",
"desktop",
"focused",
"indicator",
"outline",
"panel",
"ring",
"show",
"statusbar",
"topbar",
"virtual",
"workspace"
],
"icon": "palette",
"description": "Show an outline ring around the focused workspace indicator"
},
{
"section": "_tab_7",
"label": "Network",