4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-02-24 02:30:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

standard-button: fix layout

Browse Source
This commit is contained in:
xiphon 2018-12-08 21:26:33 +00:00
parent 71a1ff6677
commit e0796b24c9
1 changed files with 35 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
components/StandardButton.qml
View File

@ -46,22 +46,9 @@ Item {
} }
signal clicked() signal clicked()
// Dynamic height/width
Layout.minimumWidth: {
var _padding = 22;
if(button.rightIcon !== ""){
_padding += 60;
}
var _width = label.contentWidth + _padding;
if(_width <= 50) {
return 60;
}
return _width;
}
height: small ? 30 * scaleRatio : 36 * scaleRatio height: small ? 30 * scaleRatio : 36 * scaleRatio
width: buttonLayout.width + 22 * scaleRatio
Component.onCompleted: width = width
function doClick() { function doClick() {
// Android workaround // Android workaround
@ -70,9 +57,7 @@ Item {
} }
Rectangle { Rectangle {
anchors.left: parent.left anchors.fill: parent
anchors.right: parent.right
height: parent.height - 1
radius: 3 radius: 3
color: parent.enabled ? MoneroComponents.Style.buttonBackgroundColor : MoneroComponents.Style.buttonBackgroundColorDisabled color: parent.enabled ? MoneroComponents.Style.buttonBackgroundColor : MoneroComponents.Style.buttonBackgroundColorDisabled
border.width: parent.focus ? 1 : 0 border.width: parent.focus ? 1 : 0
@ -96,38 +81,41 @@ Item {
} }
} }
RowLayout {
id: buttonLayout
height: button.height
spacing: 11 * scaleRatio
anchors.centerIn: parent
Text { Text {
id: label id: label
anchors.verticalCenter: parent.verticalCenter Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
anchors.left: parent.left
anchors.right: parent.right
horizontalAlignment: textAlign === "center" ? Text.AlignHCenter : Text.AlignLeft horizontalAlignment: textAlign === "center" ? Text.AlignHCenter : Text.AlignLeft
anchors.leftMargin: textAlign === "center" ? 0 : 11
font.family: MoneroComponents.Style.fontBold.name font.family: MoneroComponents.Style.fontBold.name
font.bold: true font.bold: true
font.pixelSize: buttonArea.pressed ? button.fontSize - 1 : button.fontSize font.pixelSize: buttonArea.pressed ? button.fontSize - 1 : button.fontSize
color: parent.textColor color: button.textColor
visible: parent.icon === "" visible: button.icon === ""
} }
Image { Image {
anchors.centerIn: parent Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
visible: parent.icon !== "" visible: button.icon !== ""
source: parent.icon source: button.icon
} }
Image { Image {
visible: parent.rightIcon !== "" visible: button.rightIcon !== ""
anchors.right: parent.right Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
anchors.rightMargin: 11 * scaleRatio width: button.small ? 16 * scaleRatio : 20 * scaleRatio
anchors.verticalCenter: parent.verticalCenter height: button.small ? 16 * scaleRatio : 20 * scaleRatio
width: parent.small ? 16 * scaleRatio : 20 * scaleRatio
height: parent.small ? 16 * scaleRatio : 20 * scaleRatio
source: { source: {
if(parent.rightIconInactive !== "" && !parent.enabled){ if(button.rightIconInactive !== "" && !button.enabled) {
return parent.rightIconInactive; return button.rightIconInactive;
}
return button.rightIcon;
} }
return parent.rightIcon;
} }
} }