From 28a59a4223ab1fb9f7c80b5673064d0f7e196624 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 11:48:08 +0800 Subject: Fix primary button Fix the radius Customise border Add paddings from .btn --- Button/Primary.ui.qml | 10 +++++++++- imports/Bootstrap/Bootstrap.qml | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Button/Primary.ui.qml b/Button/Primary.ui.qml index e99f56b..831430a 100644 --- a/Button/Primary.ui.qml +++ b/Button/Primary.ui.qml @@ -4,6 +4,8 @@ import Bootstrap 5.3 Button { id: button + horizontalPadding: 16 + verticalPadding: 8 font: Bootstrap.btnFont contentItem: Text { text: button.text @@ -15,6 +17,12 @@ Button { background: Rectangle { color: button.down ? Bootstrap.btnActiveBG : button.enabled ? Bootstrap.btnBg : Bootstrap.btnDisabledBg - radius: 8 + border { + color: button.down ? Bootstrap.btnActiveBorderColor + : button.enabled ? Bootstrap.btnBorderColor + : Bootstrap.btnDisabledBorderColor + width: 1 + } + radius: 5.2 } } diff --git a/imports/Bootstrap/Bootstrap.qml b/imports/Bootstrap/Bootstrap.qml index a7a2951..57051ba 100644 --- a/imports/Bootstrap/Bootstrap.qml +++ b/imports/Bootstrap/Bootstrap.qml @@ -6,8 +6,11 @@ QtObject { readonly property color btnColor: "#ffffff" readonly property color btnBg: "#066ac9" + readonly property color btnBorderColor: "#066ac9" readonly property color btnActiveBg: "#0555a1" + readonly property color btnActiveBorderColor: "#055097" readonly property color btnDisabledBg: "#a6066ac9" + readonly property color btnDisabledBorderColor: "#a6066ac9" readonly property bool haveRoboto: Qt.platform.os === "android" || Qt.platform.os === "linux" -- cgit v1.2.3