mirror of
https://github.com/monero-project/monero-gui
synced 2025-01-03 20:56:23 +01:00
Merge pull request #1952
fd842bb
StandardButton: fix button appearance on Qt 5.7 (xiphon)
This commit is contained in:
commit
944ab59642
@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user