From 0f679956ec4e4ab2984062cb0709fd45f011fe94 Mon Sep 17 00:00:00 2001 From: miruka Date: Fri, 5 Jun 2020 06:33:55 -0400 Subject: [PATCH] Fix topic text area inside scrollview --- src/gui/Pages/Chat/RoomPane/SettingsView.qml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gui/Pages/Chat/RoomPane/SettingsView.qml b/src/gui/Pages/Chat/RoomPane/SettingsView.qml index 3032492d..050e0422 100644 --- a/src/gui/Pages/Chat/RoomPane/SettingsView.qml +++ b/src/gui/Pages/Chat/RoomPane/SettingsView.qml @@ -13,7 +13,7 @@ HFlickableColumnPage { property var saveFuture: null readonly property bool anyChange: - nameField.item.changed || topicArea.item.changed || + nameField.item.changed || topicArea.item.area.changed || encryptCheckBox.changed || requireInviteCheckbox.changed || forbidGuestsCheckBox.changed @@ -26,7 +26,7 @@ HFlickableColumnPage { const args = [ chat.roomId, nameField.item.changed ? nameField.item.text : undefined, - topicArea.item.changed ? topicArea.item.text : undefined, + topicArea.item.area.changed ? topicArea.item.area.text : undefined, encryptCheckBox.changed ? true : undefined, requireInviteCheckbox.changed ? @@ -50,7 +50,7 @@ HFlickableColumnPage { } nameField.item.reset() - topicArea.item.reset() + topicArea.item.area.reset() encryptCheckBox.reset() requireInviteCheckbox.reset() forbidGuestsCheckBox.reset() @@ -123,6 +123,8 @@ HFlickableColumnPage { height: Math.min(topicAreaIn.implicitHeight, settingsView.height / 2) + readonly property alias area: topicAreaIn + HTextArea { id: topicAreaIn placeholderText: qsTr("This room is about...")