Merge #274: Introduce CoreText control

hebasto · hebasto · commit 0fc3fdc27819 · 2023-02-27T09:46:47.000Z
32a11f3 qml: introduce CoreText control (johnny9) Pull request description: A Text item with the most commonly used property values. [![Windows](https://img.shields.io/badge/OS-Windows-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/<PR>) [![Intel macOS](https://img.shields.io/badge/OS-Intel%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/<PR>) [![Apple Silicon macOS](https://img.shields.io/badge/OS-Apple%20Silicon%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/insecure_mac_arm64_gui.zip?branch=pull/<PR>) [![ARM64 Android](https://img.shields.io/badge/OS-Android-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/<PR>) ACKs for top commit: jarolrod: ACK 32a11f3 Tree-SHA512: 1d30b1b46a67558ad9ade82c6b0b9aa6ceec7dbab81d915ebb14d24dc358a56089696f6994b27f37529d1fc8289911e2f511d90ba4f448d65d951381cb03fecb
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -345,6 +345,7 @@ QML_RES_QML = \
   qml/components/StorageOptions.qml \
   qml/components/StorageSettings.qml \
   qml/controls/ContinueButton.qml \
+  qml/controls/CoreText.qml \
   qml/controls/ExternalLink.qml \
   qml/controls/Header.qml \
   qml/controls/InformationPage.qml \
diff --git a/src/qml/bitcoin_qml.qrc b/src/qml/bitcoin_qml.qrc
@@ -15,6 +15,7 @@
         <file>components/StorageOptions.qml</file>
         <file>components/StorageSettings.qml</file>
         <file>controls/ContinueButton.qml</file>
+        <file>controls/CoreText.qml</file>
         <file>controls/ExternalLink.qml</file>
         <file>controls/Header.qml</file>
         <file>controls/InformationPage.qml</file>
diff --git a/src/qml/components/NetworkIndicator.qml b/src/qml/components/NetworkIndicator.qml
@@ -13,17 +13,14 @@ Button {
     id: root
     property color bgColor
     property int textSize: 15
-    font.family: "Inter"
-    font.styleName: "Regular"
-    font.pixelSize: root.textSize
     topPadding: 2
     bottomPadding: 2
     leftPadding: 7
     rightPadding: 7
     state: chainModel.currentNetworkName
-    contentItem: Text {
+    contentItem: CoreText {
         text: root.text
-        font: root.font
+        font.pixelSize: root.textSize
         color: Theme.color.white
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
diff --git a/src/qml/controls/ContinueButton.qml b/src/qml/controls/ContinueButton.qml
@@ -7,16 +7,11 @@ import QtQuick.Controls 2.15
 
 Button {
     id: root
-    font.family: "Inter"
-    font.styleName: "Semi Bold"
-    font.pixelSize: 18
     hoverEnabled: true
-    contentItem: Text {
+    contentItem: CoreText {
         text: parent.text
-        font: parent.font
-        color: Theme.color.white
-        horizontalAlignment: Text.AlignHCenter
-        verticalAlignment: Text.AlignVCenter
+        bold: true
+        font.pixelSize: 18
     }
     background: Rectangle {
         id: bg
diff --git a/src/qml/controls/CoreText.qml b/src/qml/controls/CoreText.qml
@@ -0,0 +1,18 @@
+// Copyright (c) 2023 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+
+Text {
+    property bool bold: false
+    property bool wrap: true
+    color: Theme.color.white
+    font.family: "Inter"
+    font.styleName: bold ? "Semi Bold" : "Regular"
+    font.pixelSize: 13
+    horizontalAlignment: Text.AlignHCenter
+    verticalAlignment: Text.AlignVCenter
+    wrapMode: wrap ? Text.WordWrap : Text.NoWrap
+}
diff --git a/src/qml/controls/ExternalLink.qml b/src/qml/controls/ExternalLink.qml
@@ -45,13 +45,12 @@ AbstractButton {
             Layout.fillWidth: true
             active: root.description.length > 0
             visible: active
-            sourceComponent: Text {
-                font.family: "Inter"
-                font.styleName: "Regular"
+            sourceComponent: CoreText {
                 font.pixelSize: root.descriptionSize
                 color: root.textColor
                 textFormat: Text.RichText
                 text: root.description
+                wrap: false
 
                 Behavior on color {
                     ColorAnimation { duration: 150 }
diff --git a/src/qml/controls/NavButton.qml b/src/qml/controls/NavButton.qml
@@ -74,12 +74,10 @@ AbstractButton {
                 bottomPadding: button_background.active ? 0 : 4
                 rightPadding: 0
                 leftPadding: button_background.active ? 0 : 20
-                font.family: "Inter"
-                font.styleName: "Semi Bold"
-                font.pixelSize: root.textSize
-                contentItem: Text {
+                contentItem: CoreText {
                     anchors.verticalCenter: parent.verticalCenter
-                    font: container.font
+                    bold: true
+                    font.pixelSize: root.textSize
                     color: Theme.color.neutral9
                     text: root.text
                 }
diff --git a/src/qml/controls/OutlineButton.qml b/src/qml/controls/OutlineButton.qml
@@ -7,16 +7,12 @@ import QtQuick.Controls 2.15
 
 Button {
     id: root
-    font.family: "Inter"
-    font.styleName: "Semi Bold"
-    font.pixelSize: 18
     hoverEnabled: true
-    contentItem: Text {
+    contentItem: CoreText {
         text: parent.text
-        font: parent.font
+        bold: true
+        font.pixelSize: 18
         color: Theme.color.neutral9
-        horizontalAlignment: Text.AlignHCenter
-        verticalAlignment: Text.AlignVCenter
     }
     background: Rectangle {
         id: bg
diff --git a/src/qml/controls/TextButton.qml b/src/qml/controls/TextButton.qml
@@ -12,17 +12,14 @@ Button {
     property color bgColor: Theme.color.background
     property bool bold: true
     property bool rightalign: false
-    font.family: "Inter"
-    font.styleName: bold ? "Semi Bold" : "Regular"
-    font.pixelSize: root.textSize
     padding: 15
     hoverEnabled: true
-    contentItem: Text {
+    contentItem: CoreText {
         text: root.text
-        font: root.font
+        bold: root.bold
+        font.pixelSize: root.textSize
         color: root.textColor
         horizontalAlignment: rightalign ? Text.AlignRight : Text.AlignHCenter
-        verticalAlignment: Text.AlignVCenter
         Behavior on color {
             ColorAnimation { duration: 150 }
         }
