diff options
author | Joseph Donofry <joedonofry@gmail.com> | 2021-08-10 19:29:58 -0400 |
---|---|---|
committer | Joseph Donofry <joedonofry@gmail.com> | 2021-08-10 19:29:58 -0400 |
commit | c91e771d538d99c9353b779ac4dd0d93a77cca6b (patch) | |
tree | a0b583cf945b5cd09622ccb68b9fc8ad0e369794 /src/ui/NhekoGlobalObject.cpp | |
parent | Merge remote-tracking branch 'nheko-im/master' into video_player_enhancements (diff) | |
parent | Protect against replay attacks (diff) | |
download | nheko-c91e771d538d99c9353b779ac4dd0d93a77cca6b.tar.xz |
Merge origin/master and fix conflicts
Diffstat (limited to 'src/ui/NhekoGlobalObject.cpp')
-rw-r--r-- | src/ui/NhekoGlobalObject.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/ui/NhekoGlobalObject.cpp b/src/ui/NhekoGlobalObject.cpp index fea10839..9e0d706b 100644 --- a/src/ui/NhekoGlobalObject.cpp +++ b/src/ui/NhekoGlobalObject.cpp @@ -6,6 +6,7 @@ #include <QDesktopServices> #include <QUrl> +#include <QWindow> #include "Cache_p.h" #include "ChatPage.h" @@ -140,3 +141,9 @@ Nheko::openJoinRoomDialog() const MainWindow::instance()->openJoinRoomDialog( [](const QString &room_id) { ChatPage::instance()->joinRoom(room_id); }); } + +void +Nheko::reparent(QWindow *win) const +{ + win->setTransientParent(MainWindow::instance()->windowHandle()); +} |