From 2e6cf03c15f0f6c0ce757ee03f0eb8faad56a407 Mon Sep 17 00:00:00 2001
From: Carl Schwan <carl@carlschwan.eu>
Date: Fri, 10 Jan 2025 10:02:29 +0000
Subject: [PATCH] Set explicitely parent in MaximizeComponent

Currently it uses applicationWindow().overlay which works but is
not ideal for multiple reasons:

- This as a tendency to breaks unexpectedly
- It can't be optimized by the qml compiler

So we are trying to move away from these construct everywhere.


(cherry picked from commit f14dfc5de80f743e7d6f3c094a4fffb6b0efcf44)

Co-authored-by: Carl Schwan <carl.schwan@gnupg.com>
---
 src/qml/GroupChatDrawerHeader.qml | 2 +-
 src/qml/RoomPage.qml              | 1 +
 src/qml/UserDetailDialog.qml      | 6 +-----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/qml/GroupChatDrawerHeader.qml b/src/qml/GroupChatDrawerHeader.qml
index 6ecf96849..54a898e84 100644
--- a/src/qml/GroupChatDrawerHeader.qml
+++ b/src/qml/GroupChatDrawerHeader.qml
@@ -89,7 +89,7 @@ ColumnLayout {
             }
 
             onClicked: {
-                let map = Qt.createComponent('org.kde.neochat', 'QrCodeMaximizeComponent').createObject(parent, {
+                let map = Qt.createComponent('org.kde.neochat', 'QrCodeMaximizeComponent').createObject(QQC2.Overlay.overlay, {
                     text: barcode.content,
                     title: root.room ? root.room.displayName : "",
                     subtitle: root.room ? root.room.id : "",
diff --git a/src/qml/RoomPage.qml b/src/qml/RoomPage.qml
index f4c27bdc6..da4d943a1 100644
--- a/src/qml/RoomPage.qml
+++ b/src/qml/RoomPage.qml
@@ -308,6 +308,7 @@ Kirigami.Page {
         NeochatMaximizeComponent {
             currentRoom: root.currentRoom
             model: root.mediaMessageFilterModel
+            parent: root.QQC2.Overlay.overlay
         }
     }
 }
diff --git a/src/qml/UserDetailDialog.qml b/src/qml/UserDetailDialog.qml
index 8b565a72f..edbf12219 100644
--- a/src/qml/UserDetailDialog.qml
+++ b/src/qml/UserDetailDialog.qml
@@ -84,7 +84,7 @@ Kirigami.Dialog {
                 }
 
                 onClicked: {
-                    let map = qrMaximizeComponent.createObject(parent, {
+                    let map = Qt.createComponent('org.kde.neochat', 'QrCodeMaximizeComponent').createObject(QQC2.Overlay.overlay, {
                         text: barcode.content,
                         title: root.room ? root.room.member(root.user.id).displayName : root.user.displayName,
                         subtitle: root.user.id,
@@ -265,8 +265,4 @@ Kirigami.Dialog {
             }
         }
     }
-    Component {
-        id: qrMaximizeComponent
-        QrCodeMaximizeComponent {}
-    }
 }