Merge pull request #914 from Thulinma/imageOverlayRoleQml

Make ImageOverlay set appropriate windowRole again
pull/1349/head^2
DeepBlueV7.X 2 years ago committed by GitHub
commit dedc3cb1f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      resources/qml/dialogs/ImageOverlay.qml
  2. 8
      src/ui/NhekoGlobalObject.cpp
  3. 1
      src/ui/NhekoGlobalObject.h

@ -23,6 +23,7 @@ Window {
//visibility: Window.FullScreen
color: Qt.rgba(0.2,0.2,0.2,0.66)
Component.onCompleted: Nheko.setWindowRole(imageOverlay, "imageoverlay")
Shortcut {
sequence: StandardKey.Cancel

@ -10,6 +10,8 @@
#include <QDesktopServices>
#include <QStyle>
#include <QUrl>
#include <QWindow>
#include <QtPlatformHeaders/QXcbWindowFunctions>
#include "Cache_p.h"
#include "ChatPage.h"
@ -178,3 +180,9 @@ Nheko::createRoom(bool space,
emit ChatPage::instance()->createRoom(req);
}
void
Nheko::setWindowRole(QWindow *win, QString newRole) const
{
QXcbWindowFunctions::setWmWindowRole(win, newRole.toUtf8());
}

@ -72,6 +72,7 @@ public:
return new AliasEditingModel(room_id_.toStdString());
}
Q_INVOKABLE void setTransientParent(QWindow *window, QWindow *parentWindow) const;
Q_INVOKABLE void setWindowRole(QWindow *win, QString newRole) const;
public slots:
void updateUserProfile();

Loading…
Cancel
Save