kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Move shell integration initialization to lib_waylandshells

Browse source
This commit is contained in:
Ilya Fedin 2022-05-19 15:39:14 +04:00 • committed by John Preston
parent 941a10c8b0
commit 21a7adc03c
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ui/platform/linux/ui_linux_wayland_integration.cpp
View file

@ -14,7 +14,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtGui/QGuiApplication> #include <QtGui/QGuiApplication>
#include <QtGui/QWindow> #include <QtGui/QWindow>
#include <qpa/qplatformnativeinterface.h> #include <qpa/qplatformnativeinterface.h>
#include <private/qguiapplication_p.h>
// private QtWaylandClient headers are using keywords :( // private QtWaylandClient headers are using keywords :(
#ifdef QT_NO_KEYWORDS #ifdef QT_NO_KEYWORDS
@ -22,7 +21,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#define slots Q_SLOTS #define slots Q_SLOTS
#endif // QT_NO_KEYWORDS #endif // QT_NO_KEYWORDS
#include <private/qwaylandintegration_p.h>
#include <private/qwaylanddisplay_p.h> #include <private/qwaylanddisplay_p.h>
#include <private/qwaylandwindow_p.h> #include <private/qwaylandwindow_p.h>
#include <private/qwaylandinputdevice_p.h> #include <private/qwaylandinputdevice_p.h>
@ -32,7 +30,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
Q_DECLARE_METATYPE(QMargins); Q_DECLARE_METATYPE(QMargins);
using QtWaylandClient::QWaylandIntegration;
using QtWaylandClient::QWaylandWindow; using QtWaylandClient::QWaylandWindow;
using namespace KWayland::Client; using namespace KWayland::Client;
@ -93,11 +90,6 @@ bool WaylandIntegration::xdgDecorationSupported() {
} }
bool WaylandIntegration::windowExtentsSupported() { bool WaylandIntegration::windowExtentsSupported() {
// initialize shell integration before querying
if (const auto integration = static_cast<QWaylandIntegration*>(
QGuiApplicationPrivate::platformIntegration())) {
integration->shellIntegration();
}
return WaylandShells::XdgShell(); return WaylandShells::XdgShell();
} }