From 8825e6ec838c80c3a92ecaf5eccaafb4e5a378e3 Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Sat, 25 Feb 2023 01:41:18 +0100
Subject: [PATCH] Add parent windows to file dialogs

This makes sure they are properly placed and modal to the main window
---
 src/qml/Page/RoomPage.qml              | 5 ++++-
 src/qml/RoomSettings/General.qml       | 5 ++++-
 src/qml/Settings/AccountEditorPage.qml | 2 ++
 src/qml/Settings/Emoticons.qml         | 4 ++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/qml/Page/RoomPage.qml b/src/qml/Page/RoomPage.qml
index 6b97e88f7..76b5c8455 100644
--- a/src/qml/Page/RoomPage.qml
+++ b/src/qml/Page/RoomPage.qml
@@ -7,6 +7,7 @@ import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15
 import Qt.labs.platform 1.1 as Platform
 import Qt.labs.qmlmodels 1.0
+import QtQuick.Window 2.15
 
 import org.kde.kirigami 2.19 as Kirigami
 import org.kde.kitemmodels 1.0
@@ -326,7 +327,9 @@ Kirigami.ScrollablePage {
         Component {
             id: openFileDialog
 
-            OpenFileDialog {}
+            OpenFileDialog {
+                parentWindow: page.Window.window
+            }
         }
 
 
diff --git a/src/qml/RoomSettings/General.qml b/src/qml/RoomSettings/General.qml
index 03d274458..cc6b52378 100644
--- a/src/qml/RoomSettings/General.qml
+++ b/src/qml/RoomSettings/General.qml
@@ -5,6 +5,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
 
 import org.kde.kirigami 2.15 as Kirigami
 import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm
@@ -281,7 +282,9 @@ Kirigami.ScrollablePage {
         Component {
             id: openFileDialog
 
-            OpenFileDialog {}
+            OpenFileDialog {
+                parentWindow: root.Window.window
+            }
         }
 
         Kirigami.OverlaySheet {
diff --git a/src/qml/Settings/AccountEditorPage.qml b/src/qml/Settings/AccountEditorPage.qml
index 33600e082..fe803f2fb 100644
--- a/src/qml/Settings/AccountEditorPage.qml
+++ b/src/qml/Settings/AccountEditorPage.qml
@@ -6,6 +6,7 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15
 import Qt.labs.platform 1.1
+import QtQuick.Window 2.15
 
 import org.kde.kirigami 2.15 as Kirigami
 import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm
@@ -248,6 +249,7 @@ Kirigami.ScrollablePage {
 
         OpenFileDialog {
             folder: StandardPaths.writableLocation(StandardPaths.PicturesLocation)
+            parentWindow: root.Window.window
         }
     }
 }
diff --git a/src/qml/Settings/Emoticons.qml b/src/qml/Settings/Emoticons.qml
index 0487aadd9..58fb1d41d 100644
--- a/src/qml/Settings/Emoticons.qml
+++ b/src/qml/Settings/Emoticons.qml
@@ -4,6 +4,7 @@
 import QtQuick 2.15
 import QtQuick.Controls 2.15 as QQC2
 import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
 
 import Qt.labs.platform 1.1
 
@@ -12,6 +13,8 @@ import org.kde.kirigami 2.15 as Kirigami
 import org.kde.neochat 1.0
 
 Kirigami.ScrollablePage {
+    id: root
+
     title: i18nc("@title:window", "Custom Emojis")
 
     ListView {
@@ -111,6 +114,7 @@ Kirigami.ScrollablePage {
         OpenFileDialog {
             folder: StandardPaths.writableLocation(StandardPaths.PicturesLocation)
             nameFilters: [i18n("Images (*.png *.gif *.webp)")]
+            parentWindow: root.Window.window
         }
     }
 }