From af65e3444e638557a5a15d9722dc93ef65470760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=EA=A6=AB=EA=A6=B6=EA=A6=8F=EA=A7=80=EA=A6=A6?= =?UTF-8?q?=EA=A6=BF=EA=A6=A7=EA=A6=AE=EA=A6=91=EA=A6=A9=EA=A6=AD=EA=A7=80?= Date: Thu, 30 Mar 2023 12:26:02 +0800 Subject: Change the way purposed buttons override Btn --- Button/Btn.ui.qml | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'Button/Btn.ui.qml') diff --git a/Button/Btn.ui.qml b/Button/Btn.ui.qml index cf5c731..1d58fe8 100644 --- a/Button/Btn.ui.qml +++ b/Button/Btn.ui.qml @@ -3,6 +3,15 @@ import QtQuick.Controls 2.15 import Eduport 1.4 Button { + property color bsBtnColor: Eduport.bsBtnColor + property color bsBtnBg: Eduport.bsBtnBg + property color bsBtnBorderColor: Eduport.bsBtnBorderColor + property color bsBtnActiveColor: Eduport.bsBtnColor + property color bsBtnActiveBg: Eduport.bsBtnBg + property color bsBtnActiveBorderColor: Eduport.bsBtnBorderColor + property color bsBtnDisabledColor: Eduport.bsBtnColor + property color bsBtnDisabledBg: Eduport.bsBtnBg + property color bsBtnDisabledBorderColor: Eduport.bsBtnBorderColor id: button horizontalPadding: Eduport.bsBtnPaddingX verticalPadding: Eduport.bsBtnPaddingY @@ -10,15 +19,23 @@ Button { contentItem: Text { text: button.text font: button.font - color: Eduport.bsBtnPrimaryColor + color: button.down + ? bsBtnActiveColor + : button.enabled + ? bsBtnColor + : bsBtnDisabledColor horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter } background: Rectangle { - color: Eduport.bsBtnBg + color: button.down + ? bsBtnActiveBg + : button.enabled + ? bsBtnBg + : bsBtnDisabledBg border { width: Eduport.bsBtnBorderWidth - color: Eduport.bsBtnBorderColor + color: bsBtnBorderColor } radius: Eduport.bsBtnBorderRadius } -- cgit v1.2.3