void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-04-15 21:57:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add support for showing window menu on Wayland

Browse source
This commit is contained in:
Ilya Fedin 2020-08-08 01:59:45 +04:00 • committed by John Preston
parent 08b67e383e
commit dc9d0aae54
5 changed files with 44 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Telegram/SourceFiles/platform/linux/specific_linux.cpp
View file

@ -585,6 +585,21 @@ bool StartWaylandResize(QWindow *window, Qt::Edges edges) {
return false;
}
bool ShowWaylandWindowMenu(QWindow *window) {
#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0) || defined DESKTOP_APP_QT_PATCHED
if (const auto waylandWindow = static_cast<QWaylandWindow*>(
window->handle())) {
if (const auto seat = waylandWindow->display()->lastInputDevice()) {
if (const auto shellSurface = waylandWindow->shellSurface()) {
return shellSurface->showWindowMenu(seat);
}
}
}
#endif // Qt >= 5.13 || DESKTOP_APP_QT_PATCHED
return false;
}
Window::Control GtkKeywordToWindowControl(const QString &keyword) {
if (keyword == qstr("minimize")) {
return Window::Control::Minimize;
@ -956,6 +971,14 @@ bool StartSystemResize(QWindow *window, Qt::Edges edges) {
}
}
bool ShowWindowMenu(QWindow *window) {
if (IsWayland()) {
return ShowWaylandWindowMenu(window);
}
return false;
}
Window::ControlsLayout WindowControlsLayout() {
#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
if (Libs::GtkSettingSupported()

4
Telegram/SourceFiles/platform/mac/specific_mac.h
View file

@ -38,6 +38,10 @@ inline bool StartSystemResize(QWindow *window, Qt::Edges edges) {
return false;
}
inline bool ShowWindowMenu(QWindow *window) {
return false;
}
inline bool AutostartSupported() {
return false;
}

1
Telegram/SourceFiles/platform/platform_specific.h
View file

@ -54,6 +54,7 @@ bool TrayIconSupported();
QImage GetImageFromClipboard();
bool StartSystemMove(QWindow *window);
bool StartSystemResize(QWindow *window, Qt::Edges edges);
bool ShowWindowMenu(QWindow *window);
Window::ControlsLayout WindowControlsLayout();
namespace ThirdParty {

12
Telegram/SourceFiles/platform/win/specific_win.cpp
View file

@ -418,6 +418,18 @@ bool AutostartSupported() {
return !IsWindowsStoreBuild();
}
bool ShowWindowMenu(QWindow *window) {
const auto pos = QCursor::pos();
SendMessage(
window->winId(),
WM_SYSCOMMAND,
SC_MOUSEMENU,
MAKELPARAM(pos.x(), pos.y()));
return true;
}
Window::ControlsLayout WindowControlsLayout() {
Window::ControlsLayout controls;
controls.right = {

8
Telegram/SourceFiles/window/window_title_qt.cpp
View file

@ -189,11 +189,11 @@ void TitleWidgetQt::resizeEvent(QResizeEvent *e) {
}
void TitleWidgetQt::mousePressEvent(QMouseEvent *e) {
if (e->button() != Qt::LeftButton) {
return;
if (e->button() == Qt::LeftButton) {
startMove();
} else if (e->button() == Qt::RightButton) {
Platform::ShowWindowMenu(window()->windowHandle());
}
startMove();
}
void TitleWidgetQt::mouseDoubleClickEvent(QMouseEvent *e) {