Merge pull request #1715 from br4yd/fix-settings-cutoff

Fix room settings and emoji verification being cut off

2 files changed, 2 insertions, 1 deletions

diff --git a/resources/qml/device-verification/EmojiVerification.qml b/resources/qml/device-verification/EmojiVerification.qml

index 0ee279cd..a8abd740 100644
--- a/resources/qml/device-verification/EmojiVerification.qml
+++ b/resources/qml/device-verification/EmojiVerification.qml
@@ -13,7 +13,7 @@ ColumnLayout {
     spacing: 16
 
     Label {
-        Layout.preferredWidth: 400
+        Layout.preferredWidth: scroll.availableWidth
         Layout.fillWidth: true
         wrapMode: Text.Wrap
         text: qsTr("Please verify the following emoji. You should see the same emoji on both sides. If they differ, please press 'They do not match!' to abort verification!")
diff --git a/resources/qml/dialogs/RoomSettingsDialog.qml b/resources/qml/dialogs/RoomSettingsDialog.qml

index b435e55b..941d4f90 100644
--- a/resources/qml/dialogs/RoomSettingsDialog.qml
+++ b/resources/qml/dialogs/RoomSettingsDialog.qml
@@ -20,6 +20,7 @@ ApplicationWindow {
     minimumHeight: 450
     width: 450
     height: 680
+    Layout.preferredWidth: scroll.availableWidth
     color: palette.window
     modality: Qt.NonModal
     flags: Qt.Dialog | Qt.WindowCloseButtonHint | Qt.WindowTitleHint