rpms/qt5-qtwayland
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove patch that is already part of upstream

Browse Source
This commit is contained in:
Jan Grulich 2023-04-11 16:21:43 +02:00
parent e5cf13418b
commit e28cdd45e6
2 changed files with 0 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0080-Client-set-constraint-adjustments-for-popups-in-xdg.patch
View File

@ -1,33 +0,0 @@
From 48b9dbb4d9d508895f7568531d8f0a7e63261b75 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@qt.io>
Date: Tue, 4 Jan 2022 12:30:36 +0100
Subject: [PATCH] client: set_constraint_adjustment() for popups in xdg
See also https://cgit.freedesktop.org/wayland/wayland-protocols/tree/stable/xdg-shell/xdg-shell.xml#n234 .
Kudos to Greg V for his original patch in jira.
Fixes: QTBUG-87303
Pick-to: 5.15 6.2 6.3
Done-with: Greg V <greg@unrelenting.technology>
Change-Id: I57df9aedea7cc6f0b6fa142a6fc6c3bdc98324c8
Reviewed-by: David Edmundson <davidedmundson@kde.org>
(cherry picked from commit 59a5fe99e1569421b920d99c5b20cdafcdcf43a9)
diff --git a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
index 4940f1c..7389021 100644
--- a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
+++ b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
@@ -437,6 +437,13 @@ void QWaylandXdgSurface::setPopup(QWaylandWindow *parent)
positioner->set_anchor(QtWayland::xdg_positioner::anchor_top_left);
positioner->set_gravity(QtWayland::xdg_positioner::gravity_bottom_right);
positioner->set_size(m_window->geometry().width(), m_window->geometry().height());
+ const QByteArray currentDesktop = qgetenv("XDG_CURRENT_DESKTOP");
+ if (currentDesktop != QByteArray("KDE")) {
+ positioner->set_constraint_adjustment(QtWayland::xdg_positioner::constraint_adjustment_slide_x
+ | QtWayland::xdg_positioner::constraint_adjustment_slide_y
+ | QtWayland::xdg_positioner::constraint_adjustment_flip_x
+ | QtWayland::xdg_positioner::constraint_adjustment_flip_y);
+ }
m_popup = new Popup(this, parent, positioner);
positioner->destroy();

1
qt5-qtwayland.spec
View File

@ -70,7 +70,6 @@ Patch53: 0053-Client-Manage-QMimeData-lifecycle.patch
Patch54: 0054-client-Do-not-cast-placeholder-screens-to-QWaylandSc.patch
Patch55: 0055-Client-Remove-flip-popup-constraints.patch
Patch80: 0080-Client-set-constraint-adjustments-for-popups-in-xdg.patch
Patch102: qtwayland-decoration-support-backports-from-qt6.patch