From c36a2ade54b12df16e9734acfe97cdeb8dddadbb Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Sun, 7 Jun 2026 02:34:43 +1000 Subject: [PATCH] fix: use height over implicitHeight for ButtonBase Also non internal and non required colours so other modules can use it --- components/controls/ButtonBase.qml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/components/controls/ButtonBase.qml b/components/controls/ButtonBase.qml index 4c85bc9e..ab263148 100644 --- a/components/controls/ButtonBase.qml +++ b/components/controls/ButtonBase.qml @@ -1,5 +1,3 @@ -//@ pragma Internal - import QtQuick import Caelestia.Config import qs.components @@ -35,10 +33,10 @@ StyledRect { readonly property alias stateLayer: stateLayer readonly property alias radiusAnim: radiusAnim - required property color activeColour - required property color inactiveColour - required property color activeOnColour - required property color inactiveOnColour + property color activeColour + property color inactiveColour + property color activeOnColour + property color inactiveOnColour property color disabledColour: Qt.alpha(Colours.palette.m3onSurface, 0.1) property color disabledOnColour: Qt.alpha(Colours.palette.m3onSurface, 0.38) @@ -60,7 +58,7 @@ StyledRect { if (internalChecked) return checkedRadius; if (isRound) - return implicitHeight / 2 * Math.min(1, Tokens.rounding.scale); + return (height || implicitHeight) / 2 * Math.min(1, Tokens.rounding.scale); return defaultRadius; } color: type === ButtonBase.Text ? "transparent" : disabled ? disabledColour : internalChecked ? activeColour : inactiveColour