rpms/qt6-qtwayland
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Do not take decoration shadows into account when placing popups

Browse Source
This commit is contained in:
Jan Grulich 2022-07-29 14:28:55 +02:00
parent 58b1ec4bdf
commit 11c7783e95
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
0101-client-do-not-take-decoration-shadows-into-account-when-placing-popups.patch Normal file
View File

@ -0,0 +1,28 @@
From a4a41fdb2d116f15d7cec4c3fe9d23ef16deb1aa Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Fri, 29 Jul 2022 11:47:02 +0200
Subject: [PATCH] Client: do not take decoration shadows into account when placing popups
The anchor rectangle is relative to the window geometry, which according
to xdg-shell specs shouldn't include invisible portions like shadows.
This causes all popups be wrongly positioned when drop-shadows are used.
Pick-to: 6.4 6.3 6.2
Change-Id: Iac30ab264599f9898f3ddecd7f0c5f2aca824ad6
---
diff --git a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
index e3dee44..c4b1942 100644
--- a/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
+++ b/src/plugins/shellintegration/xdg-shell/qwaylandxdgshell.cpp
@@ -410,8 +410,8 @@
QPoint transientPos = m_window->geometry().topLeft(); // this is absolute
transientPos -= parent->geometry().topLeft();
if (parent->decoration()) {
- transientPos.setX(transientPos.x() + parent->decoration()->margins().left());
- transientPos.setY(transientPos.y() + parent->decoration()->margins().top());
+ transientPos.setX(transientPos.x() + parent->decoration()->margins(QWaylandAbstractDecoration::ShadowsExcluded).left());
+ transientPos.setY(transientPos.y() + parent->decoration()->margins(QWaylandAbstractDecoration::ShadowsExcluded).top());
}
positioner->set_anchor_rect(transientPos.x(), transientPos.y(), 1, 1);
positioner->set_anchor(QtWayland::xdg_positioner::anchor_top_left);

6
qt6-qtwayland.spec
View File

@ -11,7 +11,7 @@
Summary: Qt6 - Wayland platform support and QtCompositor module
Name: qt6-%{qt_module}
Version: 6.3.1
Release: 3%{?dist}
Release: 4%{?dist}
License: LGPLv3
Url: http://www.qt.io
@ -26,6 +26,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
# Upstream patches
Patch100: 0100-Keep-toplevel-windows-in-the-top-left-corner-of-the-screen.patch
Patch101: 0101-client-do-not-take-decoration-shadows-into-account-when-placing-popups.patch
# Upstreamable patches
@ -174,6 +175,9 @@ popd
%endif
%changelog
* Fri Jul 29 2022 Jan Grulich <jgrulich@redhat.com> - 6.3.1-4
- Do not take decoration shadows into account when placing popups
* Tue Jul 26 2022 Jan Grulich <jgrulich@redhat.com> - 6.3.1-3
- Keep toplevel windows in the top left corner of the screen