From fd94629a326306fccfc0b51ecbc38f1c1fdbfc82 Mon Sep 17 00:00:00 2001 From: Lorenz Brun Date: Thu, 10 Nov 2022 03:57:10 +0100 Subject: [PATCH] qt5/qtwayland: fix popups being placed outside the screen QT 5 did not set layout constraints on their popups. This causes some compositors like GNOME to place the popups partially outside the screen. This change backports the corresponding fix, but with an exclusion for KDE as its current version does not work well with layout constraints. --- pkgs/development/libraries/qt-5/modules/qtwayland.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/pkgs/development/libraries/qt-5/modules/qtwayland.nix index 851e4ad6966b..e4870ec48463 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwayland.nix @@ -1,4 +1,4 @@ -{ qtModule, qtbase, qtquickcontrols, wayland, pkg-config }: +{ qtModule, qtbase, qtquickcontrols, wayland, pkg-config, fetchpatch }: qtModule { pname = "qtwayland"; @@ -11,5 +11,13 @@ qtModule { # wrapped executables from `wrapQtAppsHook` (see comment in patch for further # context). Beware: shared among different Qt5 versions. ./qtwayland-app_id.patch + # Backport of https://codereview.qt-project.org/c/qt/qtwayland/+/388338 + # Pulled from Fedora as they modified it to not apply to KDE as Plasma 5.x + # doesn't behave properly with the patch applied. See the discussion at + # https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/39 for details + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/qt5-qtwayland/raw/46376bb00d4c3dd3db2e82ad7ca5301ce16ea4ab/f/0080-Client-set-constraint-adjustments-for-popups-in-xdg.patch"; + sha256 = "sha256-XP+noYCk8fUdA0ItCqMjV7lSXDlNdB7Az9q7NRpupHc="; + }) ]; }