Merge pull request #1853

787234e LineEditMulti: fix showingHeader and padding (empty label case) (xiphon)
This commit is contained in:
luigi1111 2018-12-26 16:08:10 -06:00
commit 1f2d2db1fe
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

View File

@ -78,7 +78,7 @@ ColumnLayout {
property var onPaste: function(clipboardText) {
item.text = clipboardText;
}
property bool showingHeader: true
property bool showingHeader: labelText != "" || copyButton || pasteButton
property var wrapMode: Text.NoWrap
property alias addressValidation: input.addressValidation
property string backgroundColor: "" // mock
@ -150,7 +150,7 @@ ColumnLayout {
readOnly: false
addressValidation: false
Layout.fillWidth: true
topPadding: item.showingHeader ? 10 * scaleRatio : 0
topPadding: 10 * scaleRatio
bottomPadding: 10 * scaleRatio
wrapMode: item.wrapMode
fontSize: item.fontSize