From b3d2b1fc6251d2a75a45ef88477cbf6ed5aa9eb7 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, 23 Mar 2023 12:14:59 +0800 Subject: Implementation of .btn & primary reuses it --- Button/Btn.ui.qml | 25 +++++++++++++++++++++++++ Button/Primary.ui.qml | 30 ++++++++++++------------------ 2 files changed, 37 insertions(+), 18 deletions(-) create mode 100644 Button/Btn.ui.qml (limited to 'Button') diff --git a/Button/Btn.ui.qml b/Button/Btn.ui.qml new file mode 100644 index 0000000..cdf730b --- /dev/null +++ b/Button/Btn.ui.qml @@ -0,0 +1,25 @@ +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import Bootstrap 5.3 + +Button { + id: button + horizontalPadding: Bootstrap.btnPaddingX + verticalPadding: Bootstrap.btnPaddingY + font: Bootstrap.btnFont + contentItem: Text { + text: button.text + font: button.font + color: Bootstrap.btnColor + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + } + background: Rectangle { + color: Bootstrap.btnBg + border { + width: Bootstrap.btnBorderWidth + color: Bootstrap.btnBorderColor + } + radius: Bootstrap.btnBorderRadius + } +} diff --git a/Button/Primary.ui.qml b/Button/Primary.ui.qml index 831430a..dec0148 100644 --- a/Button/Primary.ui.qml +++ b/Button/Primary.ui.qml @@ -2,27 +2,21 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import Bootstrap 5.3 -Button { +Btn { id: button - horizontalPadding: 16 - verticalPadding: 8 - font: Bootstrap.btnFont - contentItem: Text { - text: button.text - font: button.font - color: Bootstrap.btnColor - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - } background: Rectangle { - color: button.down ? Bootstrap.btnActiveBG : button.enabled - ? Bootstrap.btnBg : Bootstrap.btnDisabledBg + color: button.down ? Bootstrap.btnPrimaryActiveBG + : button.enabled + ? Bootstrap.btnPrimaryBg + : Bootstrap.btnPrimaryDisabledBg border { - color: button.down ? Bootstrap.btnActiveBorderColor - : button.enabled ? Bootstrap.btnBorderColor - : Bootstrap.btnDisabledBorderColor - width: 1 + color: button.down + ? Bootstrap.btnPrimaryActiveBorderColor + : button.enabled + ? Bootstrap.btnPrimaryBorderColor + : Bootstrap.btnPrimaryDisabledBorderColor + width: Bootstrap.btnBorderWidth } - radius: 5.2 + radius: Bootstrap.btnBorderRadius } } -- cgit v1.2.3