kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Don't call xdg-shell code generation just for xdg_toplevel_show_window_menu

Browse source
This commit is contained in:
Ilya Fedin 2023-08-31 14:14:35 +04:00 • committed by John Preston
parent ae8a74ea98
commit 9af842571d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -317,7 +317,6 @@ elseif(LINUX)
qt_generate_wayland_protocol_client_sources(lib_ui
FILES
${third_party_loc}/wayland/protocol/wayland.xml
${third_party_loc}/wayland-protocols/stable/xdg-shell/xdg-shell.xml
)
target_link_libraries(lib_ui

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

@ -12,7 +12,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/qt_signal_producer.h"
#include "qwayland-wayland.h"
#include "qwayland-xdg-shell.h"
#include <QtGui/QGuiApplication>
#include <QtGui/QWindow>
@ -22,6 +21,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
using namespace QNativeInterface;
using namespace QNativeInterface::Private;
using namespace base::Platform::Wayland;
struct xdg_toplevel;
namespace Ui {
namespace Platform {
@ -103,8 +103,9 @@ void WaylandIntegration::showWindowMenu(
return;
}
xdg_toplevel_show_window_menu(
toplevel,
wl_proxy_marshal(
reinterpret_cast<wl_proxy*>(toplevel),
4, // XDG_TOPLEVEL_SHOW_WINDOW_MENU
seat,
native->lastInputSerial(),
point.x(),