Fix device list not showing up and UserProfile blocking the window

4 files changed, 14 insertions, 4 deletions

diff --git a/resources/qml/RoomList.qml b/resources/qml/RoomList.qml

index 979e727d..cde744c5 100644
--- a/resources/qml/RoomList.qml
+++ b/resources/qml/RoomList.qml
@@ -212,6 +212,16 @@ Page {
             Layout.preferredHeight: userInfoGrid.implicitHeight + 2 * Nheko.paddingMedium
             Layout.minimumHeight: 40
 
+            TapHandler {
+                onSingleTapped: {
+                    Nheko.updateUserProfile();
+                    var userProfile = userProfileComponent.createObject(timelineRoot, {
+                        "profile": Nheko.currentUser
+                    });
+                    userProfile.show();
+                }
+            }
+
             RowLayout {
                 id: userInfoGrid
 
diff --git a/resources/qml/RoomSettings.qml b/resources/qml/RoomSettings.qml

index 14de0edf..1f7fe5de 100644
--- a/resources/qml/RoomSettings.qml
+++ b/resources/qml/RoomSettings.qml
@@ -20,7 +20,7 @@ ApplicationWindow {
     minimumHeight: 650
     palette: Nheko.colors
     color: Nheko.colors.window
-    modality: Qt.WindowModal
+    modality: Qt.NonModal
     flags: Qt.Dialog
     title: qsTr("Room Settings")
 
@@ -205,7 +205,7 @@ ApplicationWindow {
                 title: qsTr("End-to-End Encryption")
                 text: qsTr("Encryption is currently experimental and things might break unexpectedly. <br>
                             Please take note that it can't be disabled afterwards.")
-                modality: Qt.WindowModal
+                modality: Qt.NonModal
                 onAccepted: {
                     if (roomSettings.isEncryptionEnabled)
                         return ;
diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml

index 4e5e64dc..21f34f15 100644
--- a/resources/qml/UserProfile.qml
+++ b/resources/qml/UserProfile.qml
@@ -22,7 +22,7 @@ ApplicationWindow {
     palette: Nheko.colors
     color: Nheko.colors.window
     title: profile.isGlobalUserProfile ? qsTr("Global User Profile") : qsTr("Room User Profile")
-    modality: Qt.WindowModal
+    modality: Qt.NonModal
     flags: Qt.Dialog
 
     Shortcut {
diff --git a/resources/qml/device-verification/DeviceVerification.qml b/resources/qml/device-verification/DeviceVerification.qml

index 6d0be204..e2c66c5a 100644
--- a/resources/qml/device-verification/DeviceVerification.qml
+++ b/resources/qml/device-verification/DeviceVerification.qml
@@ -15,7 +15,7 @@ ApplicationWindow {
     onClosing: TimelineManager.removeVerificationFlow(flow)
     title: stack.currentItem.title
     flags: Qt.Dialog
-    modality: Qt.WindowModal
+    modality: Qt.NonModal
     palette: Nheko.colors
     height: stack.implicitHeight
     width: stack.implicitWidth