Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-04-14 01:32:29 -04:00
Code Packages Releases Activity

themes: fix overflow of option button group

Browse Source 
fixes #1399
This commit is contained in:
bbedward
2026-02-13 10:22:07 -05:00
parent b8e5f9f3b1
commit 8a6c1e45ce
2 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/internal/server/themes/list_installed.go
View File

@@ -92,21 +92,13 @@ func HandleListInstalled(conn net.Conn, req models.Request) {
return return
} }
registry, err := themes.NewRegistry()
if err != nil {
models.RespondError(conn, req.ID, fmt.Sprintf("failed to create registry: %v", err))
return
}
allThemes, err := registry.List()
if err != nil {
models.RespondError(conn, req.ID, fmt.Sprintf("failed to list themes: %v", err))
return
}
themeMap := make(map[string]themes.Theme) themeMap := make(map[string]themes.Theme)
for _, t := range allThemes { if registry, err := themes.NewRegistry(); err == nil {
themeMap[t.ID] = t if allThemes, err := registry.List(); err == nil {
for _, t := range allThemes {
themeMap[t.ID] = t
}
}
} }
result := make([]ThemeInfo, 0, len(installedIDs)) result := make([]ThemeInfo, 0, len(installedIDs))

18
quickshell/Modules/Settings/ThemeColorsTab.qml
View File

@@ -818,9 +818,12 @@ Item {
DankButtonGroup { DankButtonGroup {
id: flavorButtonGroup id: flavorButtonGroup
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
buttonPadding: parent.width < 400 ? Theme.spacingS : Theme.spacingL property int _count: variantSelector.flavorNames.length
minButtonWidth: parent.width < 400 ? 44 : 64 property real _maxPerItem: _count > 1 ? (parent.width - (_count - 1) * spacing) / _count : parent.width
textSize: parent.width < 400 ? Theme.fontSizeSmall : Theme.fontSizeMedium buttonPadding: _maxPerItem < 55 ? Theme.spacingXS : (_maxPerItem < 75 ? Theme.spacingS : Theme.spacingL)
minButtonWidth: Math.min(_maxPerItem < 55 ? 28 : (_maxPerItem < 75 ? 44 : 64), Math.max(28, Math.floor(_maxPerItem)))
textSize: _maxPerItem < 55 ? Theme.fontSizeSmall - 2 : (_maxPerItem < 75 ? Theme.fontSizeSmall : Theme.fontSizeMedium)
checkEnabled: _maxPerItem >= 55
property int pendingIndex: -1 property int pendingIndex: -1
model: variantSelector.flavorNames model: variantSelector.flavorNames
currentIndex: pendingIndex >= 0 ? pendingIndex : variantSelector.flavorIndex currentIndex: pendingIndex >= 0 ? pendingIndex : variantSelector.flavorIndex
@@ -926,9 +929,12 @@ Item {
DankButtonGroup { DankButtonGroup {
id: variantButtonGroup id: variantButtonGroup
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
buttonPadding: parent.width < 400 ? Theme.spacingS : Theme.spacingL property int _count: variantSelector.variantNames.length
minButtonWidth: parent.width < 400 ? 44 : 64 property real _maxPerItem: _count > 1 ? (parent.width - (_count - 1) * spacing) / _count : parent.width
textSize: parent.width < 400 ? Theme.fontSizeSmall : Theme.fontSizeMedium buttonPadding: _maxPerItem < 55 ? Theme.spacingXS : (_maxPerItem < 75 ? Theme.spacingS : Theme.spacingL)
minButtonWidth: Math.min(_maxPerItem < 55 ? 28 : (_maxPerItem < 75 ? 44 : 64), Math.max(28, Math.floor(_maxPerItem)))
textSize: _maxPerItem < 55 ? Theme.fontSizeSmall - 2 : (_maxPerItem < 75 ? Theme.fontSizeSmall : Theme.fontSizeMedium)
checkEnabled: _maxPerItem >= 55
property int pendingIndex: -1 property int pendingIndex: -1
model: variantSelector.variantNames model: variantSelector.variantNames
currentIndex: pendingIndex >= 0 ? pendingIndex : variantSelector.selectedIndex currentIndex: pendingIndex >= 0 ? pendingIndex : variantSelector.selectedIndex