Merge pull request #1006

4d2f586 TextBlock: Fix multi select bug
This commit is contained in:
luigi1111 2018-03-13 16:08:21 -04:00
commit d6e03df7de
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 11 additions and 14 deletions

View file

@ -29,7 +29,7 @@
import QtQuick 2.0 import QtQuick 2.0
import moneroComponents.Clipboard 1.0 import moneroComponents.Clipboard 1.0
import moneroComponents.AddressBookModel 1.0 import moneroComponents.AddressBookModel 1.0
import "../components" as MoneroComponents
ListView { ListView {
id: listView id: listView
@ -160,10 +160,8 @@ ListView {
} }
*/ */
// -- address (in case outgoing transaction) - N/A in case of incoming // -- address (in case outgoing transaction) - N/A in case of incoming
TextEdit { MoneroComponents.TextBlock {
id: addressText id: addressText
readOnly: true
selectByMouse: true
anchors.verticalCenter: dot.verticalCenter anchors.verticalCenter: dot.verticalCenter
width: parent.width - x - 12 width: parent.width - x - 12
//elide: Text.ElideRight //elide: Text.ElideRight
@ -195,9 +193,7 @@ ListView {
text: paymentId !== "" ? qsTr("Payment ID:") + translationManager.emptyString : "" text: paymentId !== "" ? qsTr("Payment ID:") + translationManager.emptyString : ""
} }
// -- "PaymentID" value // -- "PaymentID" value
TextEdit { MoneroComponents.TextBlock {
readOnly: true
selectByMouse: true
id: paymentIdValue id: paymentIdValue
width: 136 width: 136
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
@ -209,9 +205,7 @@ ListView {
} }
// Address book lookup // Address book lookup
TextEdit { MoneroComponents.TextBlock {
readOnly: true
selectByMouse: true
id: addressBookLookupValue id: addressBookLookupValue
width: 136 width: 136
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
@ -243,10 +237,8 @@ ListView {
text: qsTr("BlockHeight:") + translationManager.emptyString text: qsTr("BlockHeight:") + translationManager.emptyString
} }
// -- "BlockHeight" value // -- "BlockHeight" value
TextEdit { MoneroComponents.TextBlock {
readOnly: true width: 200
selectByMouse: true
width: 85
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
//elide: Text.ElideRight //elide: Text.ElideRight
font.family: "Arial" font.family: "Arial"

View file

@ -4,4 +4,9 @@ TextEdit {
wrapMode: Text.Wrap wrapMode: Text.Wrap
readOnly: true readOnly: true
selectByMouse: true selectByMouse: true
// Workaround for https://bugreports.qt.io/browse/QTBUG-50587
onFocusChanged: {
if(focus === false)
deselect()
}
} }