From e36ef50482de2979921ef58aa4b9d89aff83ddae Mon Sep 17 00:00:00 2001 From: bbedward Date: Wed, 28 Oct 2026 11:56:41 -0400 Subject: [PATCH] settings: derive button group compact mode from its natural width ref #3984 ref #3982 port 2.0 (cherry picked from commit 2dd237a3af8782359b479d7ab00c593913446ef4) --- dux-qml-common | 2 +- flake.lock | 6 +++--- .../Modules/Settings/Widgets/SettingsButtonGroupRow.qml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dux-qml-common b/dux-qml-common index ee87ee32d..1d1a12d7f 160000 --- a/dux-qml-common +++ b/dux-qml-common @@ -1 +1 @@ -Subproject commit ee87ee32d093fb1e177791dc6b3894c8951d1def +Subproject commit 1d1a12d7f3578289e40e3d333910bf74e4e2fc24 diff --git a/flake.lock b/flake.lock index ccf3ba785..b55a6320a 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "dank-qml-common": { "flake": false, "locked": { - "lastModified": 1793202447, - "narHash": "sha256-vA215yUKc662r8pGclsS15Iq3ZX8OjwMIqO0pMpLAoM=", + "lastModified": 1793204516, + "narHash": "sha256-3s72olezokrN5i76FdbxtpeD4mIzx6MXlt4F6lw87DY=", "owner": "duxlabs-dev", "repo": "dux-qml-common", - "rev": "ee87ee32d093fb1e177791dc6b3894c8951d1def", + "rev": "1d1a12d7f3578289e40e3d333910bf74e4e2fc24", "type": "github" }, "original": { diff --git a/quickshell/Modules/Settings/Widgets/SettingsButtonGroupRow.qml b/quickshell/Modules/Settings/Widgets/SettingsButtonGroupRow.qml index 70e50a219..3b115bbcc 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsButtonGroupRow.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsButtonGroupRow.qml @@ -19,7 +19,7 @@ SettingsRow { property alias textSize: buttonGroup.textSize property alias checkEnabled: buttonGroup.checkEnabled - readonly property bool compact: width - buttonGroup.width - SettingsMetrics.rowPaddingH * 2 - SettingsMetrics.rowContentSpacing < SettingsMetrics.buttonGroupCompactThreshold + readonly property bool compact: width - buttonGroup.naturalWidth - SettingsMetrics.rowPaddingH * 2 - SettingsMetrics.rowContentSpacing < SettingsMetrics.buttonGroupCompactThreshold // `values` is index-aligned with `model`. property var values: []