Remove usage of HScrollableTextArea

This commit is contained in:
miruka
2020-05-29 16:35:27 -04:00
parent a91a0c18f7
commit 01d3b6b489
4 changed files with 19 additions and 132 deletions

View File

@@ -1,6 +1,7 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import "../Base"
@@ -12,7 +13,7 @@ BoxPopup {
okText: qsTr("Invite")
okEnabled: invitingAllowed && Boolean(inviteArea.text.trim())
onOpened: inviteArea.area.forceActiveFocus()
onOpened: inviteArea.forceActiveFocus()
onInvitingAllowedChanged:
if (! invitingAllowed && inviteFuture) inviteFuture.cancel()
@@ -60,14 +61,16 @@ BoxPopup {
property var failedInvites: []
HScrollableTextArea {
id: inviteArea
focusItemOnTab: box.firstButton
area.placeholderText:
qsTr("User IDs (e.g. @bob:matrix.org @alice:localhost)")
ScrollView {
Layout.fillWidth: true
Layout.fillHeight: true
HTextArea {
id: inviteArea
focusItemOnTab: box.firstButton
placeholderText:
qsTr("User IDs (e.g. @bob:matrix.org @alice:localhost)")
}
}
HLabel {

View File

@@ -1,6 +1,7 @@
// SPDX-License-Identifier: LGPL-3.0-or-later
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.12
import "../Base"
@@ -20,12 +21,14 @@ BoxPopup {
property string traceback: ""
HScrollableTextArea {
text: [message, traceback].join("\n\n") || qsTr("No info available")
area.readOnly: true
area.font.family: theme.fontFamily.mono
ScrollView {
Layout.fillWidth: true
HTextArea {
text: [message, traceback].join("\n\n") || qsTr("No info available")
readOnly: true
font.family: theme.fontFamily.mono
}
}
HCheckBox {