diff --git a/ui/platform/linux/ui_linux_wayland_integration.cpp b/ui/platform/linux/ui_linux_wayland_integration.cpp index 8757b58..5482837 100644 --- a/ui/platform/linux/ui_linux_wayland_integration.cpp +++ b/ui/platform/linux/ui_linux_wayland_integration.cpp @@ -15,7 +15,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include #include -#include // private QtWaylandClient headers are using keywords :( #ifdef QT_NO_KEYWORDS @@ -153,9 +152,8 @@ bool WaylandIntegration::showWindowMenu(QWindow *window) { return false; } - const auto pos = QHighDpi::toNativePixels( - window->mapFromGlobal(QCursor::pos()), - window); + const auto pos = window->mapFromGlobal(QCursor::pos()) + * window->devicePixelRatio(); xdg_toplevel_show_window_menu(toplevel, seat, *serial, pos.x(), pos.y()); return true; diff --git a/ui/platform/linux/ui_utility_linux.cpp b/ui/platform/linux/ui_utility_linux.cpp index 6bfa4fa..51ed21e 100644 --- a/ui/platform/linux/ui_utility_linux.cpp +++ b/ui/platform/linux/ui_utility_linux.cpp @@ -23,7 +23,6 @@ #include #include #include -#include namespace Ui { namespace Platform { @@ -505,7 +504,7 @@ bool WindowExtentsSupported() { } void SetWindowExtents(QWindow *window, const QMargins &extents) { - const auto nativeExtents = QHighDpi::toNativePixels(extents, window); + const auto nativeExtents = extents * window->devicePixelRatio(); if (const auto integration = WaylandIntegration::Instance()) { integration->setWindowExtents(window, nativeExtents); } else if (::Platform::IsX11()) {