diff --git a/README.md b/README.md index daf498a..a32a208 100644 --- a/README.md +++ b/README.md @@ -135,7 +135,7 @@ Full list of theme keys and their defaults: | `barHeight` | `32` | Bar height (px) | | `barOpacity` | `0.9` | Bar and flyout background opacity | | `barPadding` | `8` | Left/right bar content margin (px) | -| `groupSpacing` | `6` | Gap between groups and gradient border (px) | +| `barSpacing` | `12` | Gap between modules (px) | | `moduleSpacing` | `4` | Icon-to-label gap within a module (px) | | `radius` | `4` | Corner radius for flyouts and menus (px) | | `screenRadius` | `15` | Screen corner rounding, 0 to disable (px) | diff --git a/modules/Theme.qml b/modules/Theme.qml index f924df9..1e49b02 100644 --- a/modules/Theme.qml +++ b/modules/Theme.qml @@ -31,6 +31,7 @@ QtObject { property real barOpacity: 0.9 property int barHeight: 32 property int barPadding: 8 + property int barSpacing: 12 property int moduleSpacing: 4 property int groupSpacing: 6 property int radius: 4 @@ -67,6 +68,8 @@ QtObject { root.barHeight = data.barHeight; if (data.barPadding !== undefined) root.barPadding = data.barPadding; + if (data.barSpacing !== undefined) + root.barSpacing = data.barSpacing; if (data.moduleSpacing !== undefined) root.moduleSpacing = data.moduleSpacing; if (data.groupSpacing !== undefined) diff --git a/modules/TrayMenu.qml b/modules/TrayMenu.qml index 1278b43..07ed19a 100644 --- a/modules/TrayMenu.qml +++ b/modules/TrayMenu.qml @@ -81,7 +81,7 @@ M.PopupPanel { radius: M.Theme.radius } - M.ThemedIcon { + Image { id: entryIcon visible: !entryItem.modelData.isSeparator && entryItem.modelData.icon !== "" anchors.verticalCenter: parent.verticalCenter @@ -90,7 +90,6 @@ M.PopupPanel { width: M.Theme.fontSize height: M.Theme.fontSize source: entryItem.modelData.icon - tint: menuWindow.accentColor fillMode: Image.PreserveAspectFit }