slackware-current/source/l/qt6/patches/92bcb8f6b7a852c7a5d662fc34de561692a7a454.patch
Patrick J Volkerding 73b28184f0 Wed Jul 10 17:48:01 UTC 2024
a/grub-2.12-x86_64-11.txz:  Rebuilt.
  Build using --with-dejavufont=/usr/share/fonts/TTF/DejaVuSans.ttf so that
  the starfield theme is included. Thanks to opty.
d/mercurial-6.8-x86_64-1.txz:  Upgraded.
d/python-setuptools-70.3.0-x86_64-1.txz:  Upgraded.
d/rinutils-0.10.3-x86_64-1.txz:  Upgraded.
d/ruby-3.3.4-x86_64-1.txz:  Upgraded.
l/glib2-2.80.4-x86_64-1.txz:  Upgraded.
l/mozjs115-115.13.0esr-x86_64-1.txz:  Upgraded.
l/nodejs-20.15.1-x86_64-1.txz:  Upgraded.
l/qt6-6.7.2_20240610_3f005f1e-x86_64-2.txz:  Rebuilt.
  [PATCH] Client: Ensure that guessed popup parent has a shell surface.
  Thanks to ctrlaltca.
  Add another patch to fix race conditions building with ninja.
n/bluez-5.77-x86_64-1.txz:  Upgraded.
n/getmail-6.19.03-x86_64-1.txz:  Upgraded.
x/xdm-1.1.16-x86_64-2.txz:  Rebuilt.
  Patched to fix an issue drawing/erasing text in the login dialog.
  Thanks to GazL.
x/xorg-server-xwayland-24.1.1-x86_64-1.txz:  Upgraded.
xap/mozilla-firefox-128.0esr-x86_64-1.txz:  Upgraded.
  This update contains security fixes and improvements.
  For more information, see:
    https://www.mozilla.org/en-US/firefox/128.0esr/releasenotes/
    https://www.mozilla.org/security/advisories/mfsa2024-29/
    https://www.cve.org/CVERecord?id=CVE-2024-6606
    https://www.cve.org/CVERecord?id=CVE-2024-6607
    https://www.cve.org/CVERecord?id=CVE-2024-6608
    https://www.cve.org/CVERecord?id=CVE-2024-6609
    https://www.cve.org/CVERecord?id=CVE-2024-6610
    https://www.cve.org/CVERecord?id=CVE-2024-6600
    https://www.cve.org/CVERecord?id=CVE-2024-6601
    https://www.cve.org/CVERecord?id=CVE-2024-6602
    https://www.cve.org/CVERecord?id=CVE-2024-6603
    https://www.cve.org/CVERecord?id=CVE-2024-6611
    https://www.cve.org/CVERecord?id=CVE-2024-6612
    https://www.cve.org/CVERecord?id=CVE-2024-6613
    https://www.cve.org/CVERecord?id=CVE-2024-6614
    https://www.cve.org/CVERecord?id=CVE-2024-6604
    https://www.cve.org/CVERecord?id=CVE-2024-6615
  (* Security fix *)
2024-07-10 20:43:22 +02:00

37 lines
1.4 KiB
Diff

From 92bcb8f6b7a852c7a5d662fc34de561692a7a454 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Thu, 20 Jun 2024 11:25:06 +0300
Subject: [PATCH] Client: Ensure that guessed popup parent has a shell surface
The last input window may not have a shell surface if it is a subsurface
or that window has been just made invisible.
Change-Id: Iad11c68659579429ddc5d9ba0038975b25da8e0d
Reviewed-by: David Edmundson <davidedmundson@kde.org>
(cherry picked from commit 52c406cec149634680489faeeaf06bb1258cd12f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 7d04c18531276c94bfdf2f9a955d6f02554b28b2)
---
src/client/qwaylandwindow.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 22aeba102..c3725ffc9 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -1157,8 +1157,10 @@ QWaylandWindow *QWaylandWindow::guessTransientParent() const
return mTopPopup;
}
- if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup)
- return display()->lastInputWindow();
+ if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup) {
+ if (auto lastInputWindow = display()->lastInputWindow())
+ return closestShellSurfaceWindow(lastInputWindow->window());
+ }
return nullptr;
}
--
GitLab