From 84b2cf08a196e4af6bf40073d5416c4bdbdee031 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Thu, 15 Apr 2021 01:39:32 +0200 Subject: [PATCH] Set Dialog flag on Dialogs Relates to #538 --- resources/qml/RoomSettings.qml | 1 + resources/qml/UserProfile.qml | 2 ++ resources/qml/device-verification/DeviceVerification.qml | 3 +++ 3 files changed, 6 insertions(+) diff --git a/resources/qml/RoomSettings.qml b/resources/qml/RoomSettings.qml index fdf8d980..0568cdc2 100644 --- a/resources/qml/RoomSettings.qml +++ b/resources/qml/RoomSettings.qml @@ -21,6 +21,7 @@ ApplicationWindow { palette: colors color: colors.window modality: Qt.WindowModal + flags: Qt.Dialog Shortcut { sequence: StandardKey.Cancel diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml index 055bd7a2..92b8b83f 100644 --- a/resources/qml/UserProfile.qml +++ b/resources/qml/UserProfile.qml @@ -22,6 +22,8 @@ ApplicationWindow { palette: colors color: colors.window title: profile.isGlobalUserProfile ? qsTr("Global User Profile") : qsTr("Room User Profile") + modality: Qt.WindowModal + flags: Qt.Dialog Shortcut { sequence: StandardKey.Cancel diff --git a/resources/qml/device-verification/DeviceVerification.qml b/resources/qml/device-verification/DeviceVerification.qml index fee0284a..41ed8d57 100644 --- a/resources/qml/device-verification/DeviceVerification.qml +++ b/resources/qml/device-verification/DeviceVerification.qml @@ -15,9 +15,12 @@ ApplicationWindow { onClosing: TimelineManager.removeVerificationFlow(flow) title: stack.currentItem.title flags: Qt.Dialog + modality: Qt.WindowModal palette: colors height: stack.implicitHeight width: stack.implicitWidth + x: MainWindow.x + (MainWindow.width / 2) - (width / 2) + y: MainWindow.y + (MainWindow.height / 2) - (height / 2) StackView { id: stack