From 194bd07f82361311d23c2d90a681ee00701d3632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=BDeljan=20Rikalo?= Date: Thu, 14 Nov 2024 12:56:26 +0000 Subject: [PATCH] Qt5, Qt6: fixed PopupParent = modal form, issue #41241 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 9ba7c6e286c43bc0f5f85999d3b0eec88d47ed52) Co-authored-by: Željan Rikalo --- lcl/interfaces/qt5/qtwsforms.pp | 3 +-- lcl/interfaces/qt6/qtwsforms.pp | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lcl/interfaces/qt5/qtwsforms.pp b/lcl/interfaces/qt5/qtwsforms.pp index 678f932e63..4aa9fa6877 100644 --- a/lcl/interfaces/qt5/qtwsforms.pp +++ b/lcl/interfaces/qt5/qtwsforms.pp @@ -630,8 +630,7 @@ begin if (APopupParent <> nil) then begin Widget.setParent(TQtWidget(APopupParent.Handle).Widget); - {use direct X11 call instead of QtTool flag.issue #29253} - SetTransientForHint(Widget.Widget, TQtWidget(APopupParent.Handle).Widget); + Widget.setWindowFlags(Widget.windowFlags or QtDialog); // issue #41241 end; end; {$ENDIF} diff --git a/lcl/interfaces/qt6/qtwsforms.pp b/lcl/interfaces/qt6/qtwsforms.pp index af66ca30f8..1ee26235ef 100644 --- a/lcl/interfaces/qt6/qtwsforms.pp +++ b/lcl/interfaces/qt6/qtwsforms.pp @@ -627,10 +627,7 @@ begin if (APopupParent <> nil) then begin Widget.setParent(TQtWidget(APopupParent.Handle).Widget); - {use direct X11 call instead of QtTool flag.issue #29253} - //SetTransientForHint(Widget.Widget, TQtWidget(APopupParent.Handle).Widget); - {$note check if this is good supplement for SetTransientForHint} - // QWindow_setTransientParent(Widget.WindowHandle, TQtWidget(APopupParent.Handle).WindowHandle); + Widget.setWindowFlags(Widget.windowFlags or QtDialog); // issue #41241 end; end; {$ENDIF}