From 151697bbe6d46f5e26815dbc5368be577595f92b Mon Sep 17 00:00:00 2001 From: talksik Date: Fri, 11 Apr 2025 13:33:42 -0700 Subject: [PATCH] fix: tweak primary, secondary, ghost buttons --- AppGhostButton.qml | 2 +- AppPrimaryButton.qml | 11 +++++++++++ AppSecondaryButton.qml | 11 +++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/AppGhostButton.qml b/AppGhostButton.qml index 4509b99..8c5474b 100644 --- a/AppGhostButton.qml +++ b/AppGhostButton.qml @@ -13,7 +13,7 @@ Button { implicitWidth: 100 implicitHeight: 40 visible: !control.flat || control.down || control.checked || control.highlighted - color: control.down ? "transparent" : Theme.card + color: control.down ? Theme.card : "transparent" border.width: 0 // custom radius: Theme.radius diff --git a/AppPrimaryButton.qml b/AppPrimaryButton.qml index f3456c9..4680fef 100644 --- a/AppPrimaryButton.qml +++ b/AppPrimaryButton.qml @@ -8,6 +8,17 @@ Button { font.family: Fonts.dotrice font.bold: true + contentItem: IconLabel { + spacing: control.spacing + mirrored: control.mirrored + display: control.display + + icon: control.icon + text: control.text + font: control.font + color: "#FFFFFF" + } + background: Rectangle { // NOTE: copied from ~/Qt/6.8.3/macos/qml/QtQuick/Controls/Basic/Button.qml implicitWidth: 100 diff --git a/AppSecondaryButton.qml b/AppSecondaryButton.qml index ee72160..9958114 100644 --- a/AppSecondaryButton.qml +++ b/AppSecondaryButton.qml @@ -8,6 +8,17 @@ Button { font.family: Fonts.dotrice font.bold: true + contentItem: IconLabel { + spacing: control.spacing + mirrored: control.mirrored + display: control.display + + icon: control.icon + text: control.text + font: control.font + color: Theme.foreground + } + background: Rectangle { // NOTE: copied from ~/Qt/6.8.3/macos/qml/QtQuick/Controls/Basic/Button.qml implicitWidth: 100