Merge pull request #1869

7fe69ca Receive: fix priority dropdown alignment (selsta)
This commit is contained in:
luigi1111 2018-12-29 15:07:58 -06:00
commit 97de72b27d
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -130,33 +130,27 @@ Rectangle {
ColumnLayout {
Layout.fillWidth: true
Layout.minimumWidth: 200 * scaleRatio
RowLayout {
id: amountRow
// Amount input
LineEdit {
id: amountLine
Layout.fillWidth: true
Layout.minimumWidth: 200
// Amount input
LineEdit {
id: amountLine
Layout.fillWidth: true
inlineIcon: true
labelText: qsTr("Amount") + translationManager.emptyString
placeholderText: qsTr("") + translationManager.emptyString
width: 100
fontBold: true
inlineButtonText: qsTr("All") + translationManager.emptyString
inlineButton.onClicked: amountLine.text = "(all)"
onTextChanged: {
if(amountLine.text.indexOf('.') === 0){
amountLine.text = '0' + amountLine.text;
}
inlineIcon: true
labelText: qsTr("Amount") + translationManager.emptyString
placeholderText: qsTr("") + translationManager.emptyString
width: 100 * scaleRatio
fontBold: true
inlineButtonText: qsTr("All") + translationManager.emptyString
inlineButton.onClicked: amountLine.text = "(all)"
onTextChanged: {
if(amountLine.text.indexOf('.') === 0){
amountLine.text = '0' + amountLine.text;
}
}
validator: RegExpValidator {
regExp: /^(\d{1,8})?([\.]\d{1,12})?$/
}
validator: RegExpValidator {
regExp: /^(\d{1,8})?([\.]\d{1,12})?$/
}
}
}
@ -165,7 +159,7 @@ Rectangle {
Layout.fillWidth: true
Label {
id: transactionPriority
Layout.topMargin: 14
Layout.topMargin: 12 * scaleRatio
text: qsTr("Transaction priority") + translationManager.emptyString
fontBold: false
fontSize: 16
@ -191,7 +185,7 @@ Rectangle {
StandardDropdown {
Layout.fillWidth: true
id: priorityDropdown
Layout.topMargin: 6
Layout.topMargin: 5 * scaleRatio
shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00"
releasedColor: "#363636"