mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-11-17 00:07:51 +00:00
Merge pull request #1553
ccb1f36
Changed regex to support amount lines starting with a period, but block the transaction creation wizard (skftn)94e3d98
Increased left margin for the amount text (skftn)
This commit is contained in:
commit
c46b5c82cd
2 changed files with 8 additions and 3 deletions
|
@ -196,7 +196,7 @@ Item {
|
|||
MoneroComponents.Input {
|
||||
id: input
|
||||
anchors.fill: parent
|
||||
anchors.leftMargin: inlineIcon.visible ? 38 : 0
|
||||
anchors.leftMargin: inlineIcon.visible ? 44 * scaleRatio : 0
|
||||
font.pixelSize: item.fontSize
|
||||
font.bold: item.fontBold
|
||||
onEditingFinished: item.editingFinished()
|
||||
|
|
|
@ -162,7 +162,7 @@ Rectangle {
|
|||
inlineButton.onClicked: amountLine.text = "(all)"
|
||||
|
||||
validator: RegExpValidator {
|
||||
regExp: /(\d{1,8})([.]\d{1,12})?$/
|
||||
regExp: /(.|)(\d{1,8})([.]\d{1,12})?$/
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -337,7 +337,12 @@ Rectangle {
|
|||
if(parseFloat(amountLine.text) > parseFloat(unlockedBalanceText)){
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
// The amount does not start with a period (example: `.4`)
|
||||
if(amountLine.text.startsWith('.')){
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
onClicked: {
|
||||
|
|
Loading…
Reference in a new issue