kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Revert "Fix packaged build"

Browse source 
This reverts commit 4689c896e2.
This commit is contained in:
John Preston 2022-08-08 09:39:59 +03:00
parent b75b69d59d
commit c6727e673d
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,11 +12,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "waylandshells/xdg_shell.h" #include "waylandshells/xdg_shell.h"
#include "qwayland-xdg-shell.h" #include "qwayland-xdg-shell.h"
// must be before QtPlugin include
#ifndef QT_STATICPLUGIN
#define QT_STATICPLUGIN
#endif // !QT_STATICPLUGIN
#include <QtCore/QtPlugin> #include <QtCore/QtPlugin>
#include <QtGui/QGuiApplication> #include <QtGui/QGuiApplication>
#include <QtGui/QWindow> #include <QtGui/QWindow>
@ -29,6 +24,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#define slots Q_SLOTS #define slots Q_SLOTS
#endif // QT_NO_KEYWORDS #endif // QT_NO_KEYWORDS
#ifndef QT_STATICPLUGIN
#define QT_STATICPLUGIN
#endif // !QT_STATICPLUGIN
#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>
@ -71,9 +70,8 @@ public:
QRect geometry() const override { QRect geometry() const override {
if (!_settingGeometry) { if (!_settingGeometry) {
if (window()->inherits("QWidgetWindow")) { if (const auto widgetWindow = qobject_cast<const QWidgetWindow*>(
const auto widgetWindow = static_cast<QWidgetWindow*>( window())) {
window());
return widgetWindow->widget()->geometry(); return widgetWindow->widget()->geometry();
} }
} }