diff options
| author | DeepBlueV7.X <nicolas.werner@hotmail.de> | 2024-04-23 22:53:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-23 22:53:49 +0000 |
| commit | a0fcb9458e9181a5ad4fac366613c30da9af38f2 (patch) | |
| tree | 2ca4132fdd58047988c1e5b65abb174a972c9f42 | |
| parent | Workaround re2 cmake issue on AS runner (diff) | |
| parent | Fix emoji verification dialogue being cut off (diff) | |
| download | nheko-a0fcb9458e9181a5ad4fac366613c30da9af38f2.tar.xz | |
Merge pull request #1715 from br4yd/fix-settings-cutoff
Fix room settings and emoji verification being cut off
| -rw-r--r-- | resources/qml/device-verification/EmojiVerification.qml | 2 | ||||
| -rw-r--r-- | resources/qml/dialogs/RoomSettingsDialog.qml | 1 |
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 |