diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-02-24 10:29:29 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-02-24 10:29:29 -0600 |
| commit | 944ab59642cc3ecc10f6d7a1b10ae6fc897d6944 (patch) | |
| tree | 044bb05f2501bb764f7543d936465efd51caca64 | |
| parent | d9c2b34d3f3f92f6d50ca8e72e5bf2d74a6e1fb2 (diff) | |
| parent | fd842bb9e4d20efec50012293a5faca559570f73 (diff) | |
| download | monzero-gui-944ab59642cc3ecc10f6d7a1b10ae6fc897d6944.tar.gz monzero-gui-944ab59642cc3ecc10f6d7a1b10ae6fc897d6944.tar.xz monzero-gui-944ab59642cc3ecc10f6d7a1b10ae6fc897d6944.zip | |
Merge pull request #1952
fd842bb StandardButton: fix button appearance on Qt 5.7 (xiphon)
| -rw-r--r-- | components/StandardButton.qml | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/components/StandardButton.qml b/components/StandardButton.qml index ebd41036..3419cf59 100644 --- a/components/StandardButton.qml +++ b/components/StandardButton.qml @@ -36,7 +36,6 @@ Item { property string rightIcon: "" property string rightIconInactive: "" property string textColor: button.enabled? MoneroComponents.Style.buttonTextColor: MoneroComponents.Style.buttonTextColorDisabled - property string textAlign: rightIcon !== "" ? "left" : "center" property bool small: false property alias text: label.text property int fontSize: { @@ -103,8 +102,6 @@ Item { Text { id: label - Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter - horizontalAlignment: textAlign === "center" ? Text.AlignHCenter : Text.AlignLeft font.family: MoneroComponents.Style.fontBold.name font.bold: true font.pixelSize: button.fontSize @@ -112,15 +109,13 @@ Item { visible: text !== "" Text { - anchors.fill: parent + anchors.centerIn: parent color: button.textColor font.bold: label.font.bold font.family: label.font.family font.pixelSize: label.font.pixelSize - 1 - horizontalAlignment: label.horizontalAlignment - Layout.alignment: label.Layout.alignment text: label.text - visible: buttonArea.pressed + opacity: buttonArea.pressed ? 1 : 0 } } |