[neon/kde/kio/Neon/stable] debian/patches: Revert "add patch recommended by nate"
Jonathan Riddell
null at kde.org
Mon Jul 22 13:53:53 BST 2024
Git commit 5142ea2c43c763c01e06cdfb96b20083f782cfed by Jonathan Riddell.
Committed on 22/07/2024 at 12:53.
Pushed by jriddell into branch 'Neon/stable'.
Revert "add patch recommended by nate"
This reverts commit cd3759ad04b85d6d678e61dda16a3d3dacf8a529.
D +0 -40 debian/patches/remove-parent-from-dropmenu.diff
M +0 -1 debian/patches/series
https://invent.kde.org/neon/kde/kio/-/commit/5142ea2c43c763c01e06cdfb96b20083f782cfed
diff --git a/debian/patches/remove-parent-from-dropmenu.diff b/debian/patches/remove-parent-from-dropmenu.diff
deleted file mode 100644
index 3692088..0000000
--- a/debian/patches/remove-parent-from-dropmenu.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-commit e0ea91afdf0dccef7e3afbf23a159bf5a8d6b249
-Author: Vlad Zahorodnii <vlad.zahorodnii at kde.org>
-Date: Mon Jul 15 09:45:20 2024 +0300
-
- Remove parent for DropMenu
-
- QWidget::winId() will force creating window handles for all its ancestor
- widgets unless the Qt::WA_DontCreateNativeAncestors flag is set.
-
- For example, on wayland, this would result in creating sub-surfaces, and
- depending on the client, it's likely that there are going to be issues with
- painting.
-
- On the other hand, since the DropJob takes care of setting the transient
- parent for the DropMenu, the parent can be simply omitted.
-
- BUG: 490183
-
-diff --git a/src/widgets/dropjob.cpp b/src/widgets/dropjob.cpp
-index e11e762bd..f4a23f568 100644
---- a/src/widgets/dropjob.cpp
-+++ b/src/widgets/dropjob.cpp
-@@ -520,8 +520,7 @@ void DropJobPrivate::slotDropActionDetermined(int error)
-
- // There was an error, handle it
- if (error == KIO::ERR_UNKNOWN) {
-- auto *window = KJobWidgets::window(q);
-- KIO::DropMenu *menu = new KIO::DropMenu(window);
-+ KIO::DropMenu *menu = new KIO::DropMenu();
- QObject::connect(menu, &QMenu::aboutToHide, menu, &QObject::deleteLater);
-
- // If the user clicks outside the menu, it will be destroyed without emitting the triggered signal.
-@@ -541,6 +540,7 @@ void DropJobPrivate::slotDropActionDetermined(int error)
- menu->windowHandle()->setTransientParent(transientParent);
- }
- }
-+ auto *window = KJobWidgets::window(q);
- menu->popup(window ? window->mapToGlobal(m_relativePos) : QCursor::pos());
- }
- m_menus.insert(menu);
diff --git a/debian/patches/series b/debian/patches/series
index 4552e03..00130ac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ wait_for_a_bit_longer
Disable-flaky-test.patch
Disable-baloo-dependant-tests.patch
-remove-parent-from-dropmenu.diff
More information about the Neon-commits
mailing list