From debf99a5d947f6641e74770d7b72bad0988e706c Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Mon, 15 Sep 2025 23:09:51 +1000 Subject: utilities: fix colours Fix transparency + some button colours --- components/controls/TextButton.qml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'components/controls/TextButton.qml') diff --git a/components/controls/TextButton.qml b/components/controls/TextButton.qml index 65e9f09..71ebcfa 100644 --- a/components/controls/TextButton.qml +++ b/components/controls/TextButton.qml @@ -25,9 +25,17 @@ StyledRect { property bool internalChecked property color activeColour: type === TextButton.Filled ? Colours.palette.m3primary : Colours.palette.m3secondary - property color inactiveColour: type === TextButton.Filled ? Colours.palette.m3surfaceContainer : Colours.palette.m3secondaryContainer - property color activeOnColour: type === TextButton.Filled ? Colours.palette.m3onPrimary : Colours.palette.m3onSecondary - property color inactiveOnColour: type === TextButton.Filled ? Colours.palette.m3onSurface : Colours.palette.m3onSecondaryContainer + property color inactiveColour: type === TextButton.Filled ? Colours.tPalette.m3surfaceContainer : Colours.palette.m3secondaryContainer + property color activeOnColour: { + if (type === TextButton.Text) + return Colours.palette.m3primary; + return type === TextButton.Filled ? Colours.palette.m3onPrimary : Colours.palette.m3onSecondary; + } + property color inactiveOnColour: { + if (type === TextButton.Text) + return Colours.palette.m3primary; + return type === TextButton.Filled ? Colours.palette.m3onSurface : Colours.palette.m3onSecondaryContainer; + } signal clicked -- cgit v1.2.3-freya