d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unset the transient parent on separate chat windows

Browse source 
relates to #1168
This commit is contained in:
Nicolas Werner 2022-08-31 20:44:21 +02:00
parent 130e1b43fb
commit 01fd5e6b61
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
resources/qml/RoomList.qml
View file

@ -74,7 +74,10 @@ Page {
property var room: null property var room: null
property var roomPreview: null property var roomPreview: null
Component.onCompleted: MainWindow.addPerRoomWindow(room.roomId || roomPreview.roomid, roomWindowW) Component.onCompleted: {
MainWindow.addPerRoomWindow(room.roomId || roomPreview.roomid, roomWindowW);
Nheko.setTransientParent(roomWindowW, null);
}
Component.onDestruction: MainWindow.removePerRoomWindow(room.roomId || roomPreview.roomid, roomWindowW) Component.onDestruction: MainWindow.removePerRoomWindow(room.roomId || roomPreview.roomid, roomWindowW)
height: 650 height: 650
@ -84,8 +87,7 @@ Page {
palette: Nheko.colors palette: Nheko.colors
color: Nheko.colors.window color: Nheko.colors.window
title: room.plainRoomName title: room.plainRoomName
modality: Qt.NonModal //flags: Qt.Window | Qt.WindowCloseButtonHint | Qt.WindowTitleHint
flags: Qt.Window | Qt.WindowCloseButtonHint | Qt.WindowTitleHint
Shortcut { Shortcut {
sequence: StandardKey.Cancel sequence: StandardKey.Cancel

7
src/ui/NhekoGlobalObject.cpp
View file

@ -128,6 +128,13 @@ Nheko::logout() const
ChatPage::instance()->initiateLogout(); ChatPage::instance()->initiateLogout();
} }
void
Nheko::setTransientParent(QWindow *window, QWindow *parentWindow) const
{
if (window)
window->setTransientParent(parentWindow);
}
void void
Nheko::createRoom(QString name, QString topic, QString aliasLocalpart, bool isEncrypted, int preset) Nheko::createRoom(QString name, QString topic, QString aliasLocalpart, bool isEncrypted, int preset)
{ {

2
src/ui/NhekoGlobalObject.h
View file

@ -8,6 +8,7 @@
#include <QFontDatabase> #include <QFontDatabase>
#include <QObject> #include <QObject>
#include <QPalette> #include <QPalette>
#include <QWindow>
#include "AliasEditModel.h" #include "AliasEditModel.h"
#include "PowerlevelsEditModels.h" #include "PowerlevelsEditModels.h"
@ -65,6 +66,7 @@ public:
{ {
return new AliasEditingModel(room_id_.toStdString()); return new AliasEditingModel(room_id_.toStdString());
} }
Q_INVOKABLE void setTransientParent(QWindow *window, QWindow *parentWindow) const;
public slots: public slots:
void updateUserProfile(); void updateUserProfile();