paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-06 02:18:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt5, Qt6: fixed showing and destroying popup window with popup parent modal form. issue #41433

Browse Source
This commit is contained in:
zeljan1 2025-02-15 12:54:05 +01:00
parent 5df0a8f05a
commit 740f63fe4c
6 changed files with 67 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lcl/interfaces/qt5/qtwidgets.pas
View File

@ -671,7 +671,7 @@ type
ScrollArea: TQtWindowArea;
{$ENDIF}
destructor Destroy; override;
procedure Destroyed; cdecl; override;
procedure BeginUpdate; override;
procedure EndUpdate; override;
@ -713,8 +713,9 @@ type
property Blocked: Boolean read FBlocked write FBlocked;
property IsFrameWindow: Boolean read FIsFrameWindow write FIsFrameWindow; {check if our LCLObject is TCustomFrame}
property FirstPaintEvent: boolean read FFirstPaintEvent write FFirstPaintEvent; {only for x11 - if firstpaintevent arrived we are 100% sure that frame is 100% accurate}
property ShowOnTaskBar: Boolean read FShowOnTaskBar;
property MenuBar: TQtMenuBar read FMenuBar;
property PopupParent: QWidgetH read FPopupParent;
property ShowOnTaskBar: Boolean read FShowOnTaskBar;
public
function WinIDNeeded: boolean; override;
procedure AttachEvents; override;
@ -2973,15 +2974,15 @@ end;
Params: None
Returns: Nothing
Note: LCL uses LM_CLOSEQUERY to set the form visibility and if we don<EFBFBD>t send this
message, you won<EFBFBD>t be able to show a form twice.
Note: LCL uses LM_CLOSEQUERY to set the form visibility and if we don't send this
message, you won't be able to show a form twice.
------------------------------------------------------------------------------}
function TQtWidget.SlotClose: Boolean; cdecl;
var
Msg : TLMessage;
begin
{$ifdef VerboseQt}
WriteLn('TQtWidget.SlotClose');
WriteLn('TQtWidget.SlotClose ',dbgsName(LCLObject));
{$endif}
FillChar(Msg{%H-}, SizeOf(Msg), 0);
@ -3004,7 +3005,7 @@ var
Msg: TLMessage;
begin
{$ifdef VerboseQt}
WriteLn('TQtWidget.SlotDestroy');
WriteLn('TQtWidget.SlotDestroy ',dbgsName(LCLObject));
{$endif}
FillChar(Msg{%H-}, SizeOf(Msg), #0);
@ -7417,6 +7418,20 @@ begin
inherited Destroy;
end;
procedure TQtMainWindow.Destroyed; cdecl;
begin
//this is event from qt, must inform LCL about it. issue #41433
//when non modal popup is shown over modal form and modal form = real popup parent
//if popup form, and modal form is closed on button close then qt releases
//popup form automatically, so all we have todo is inform LCL.
if Assigned(LCLObject) and (LCLObject.Parent = nil) and not IsMdiChild then
begin
Widget := nil;
SlotDestroy;
end else
inherited Destroyed;
end;
procedure TQtMainWindow.BeginUpdate;
begin
inherited BeginUpdate;

5
lcl/interfaces/qt5/qtwscontrols.pp
View File

@ -259,7 +259,10 @@ end;
------------------------------------------------------------------------------}
class procedure TQtWSWinControl.DestroyHandle(const AWinControl: TWinControl);
begin
TQtWidget(AWinControl.Handle).Release;
if not WSCheckHandleAllocated(AWinControl, 'DestroyHandle') then
Exit;
if QtWidgetSet.IsValidHandle(AWinControl.Handle) then
TQtWidget(AWinControl.Handle).Release;
end;
{------------------------------------------------------------------------------

10
lcl/interfaces/qt5/qtwsforms.pp
View File

@ -629,7 +629,9 @@ begin
APopupParent := TCustomForm(AWinControl).GetRealPopupParent;
if (APopupParent <> nil) then
begin
Widget.setParent(TQtWidget(APopupParent.Handle).Widget);
//attach destroy event to PopupParent.Handle.Widget via signal on Widget
//use setRealPopupParent, issue #41433
Widget.setRealPopupParent(TQtWidget(APopupParent.Handle).Widget);
Widget.setWindowFlags(Widget.windowFlags or QtDialog); // issue #41241
end;
end;
@ -644,6 +646,12 @@ begin
end;
Widget.setVisible(AWinControl.HandleObjectShouldBeVisible);
if not AWinControl.HandleObjectShouldBeVisible then
begin
// issue #41433
if Widget.PopupParent <> nil then
Widget.setRealPopupParent(nil);
end;
Widget.EndUpdate;
{$IFDEF HASX11}

24
lcl/interfaces/qt6/qtwidgets.pas
View File

@ -669,6 +669,7 @@ type
ScrollArea: TQtWindowArea;
{$ENDIF}
destructor Destroy; override;
procedure Destroyed; cdecl; override;
procedure BeginUpdate; override;
procedure EndUpdate; override;
@ -713,6 +714,7 @@ type
property IsFrameWindow: Boolean read FIsFrameWindow write FIsFrameWindow; {check if our LCLObject is TCustomFrame}
property FirstPaintEvent: boolean read FFirstPaintEvent write FFirstPaintEvent; {only for x11 - if firstpaintevent arrived we are 100% sure that frame is 100% accurate}
property MenuBar: TQtMenuBar read FMenuBar;
property PopupParent: QWidgetH read FPopupParent;
property ShowOnTaskBar: Boolean read FShowOnTaskBar;
public
function WinIDNeeded: boolean; override;
@ -2969,15 +2971,15 @@ end;
Params: None
Returns: Nothing
Note: LCL uses LM_CLOSEQUERY to set the form visibility and if we don<EFBFBD>t send this
message, you won<EFBFBD>t be able to show a form twice.
Note: LCL uses LM_CLOSEQUERY to set the form visibility and if we don't send this
message, you won't be able to show a form twice.
------------------------------------------------------------------------------}
function TQtWidget.SlotClose: Boolean; cdecl;
var
Msg : TLMessage;
begin
{$ifdef VerboseQt}
WriteLn('TQtWidget.SlotClose');
WriteLn('TQtWidget.SlotClose ',dbgsName(LCLObject));
{$endif}
FillChar(Msg{%H-}, SizeOf(Msg), 0);
@ -3000,7 +3002,7 @@ var
Msg: TLMessage;
begin
{$ifdef VerboseQt}
WriteLn('TQtWidget.SlotDestroy');
WriteLn('TQtWidget.SlotDestroy ',dbgsName(LCLObject));
{$endif}
FillChar(Msg{%H-}, SizeOf(Msg), #0);
@ -7367,6 +7369,20 @@ begin
inherited Destroy;
end;
procedure TQtMainWindow.Destroyed; cdecl;
begin
//this is event from qt, must inform LCL about it. issue #41433
//when non modal popup is shown over modal form and modal form = real popup parent
//if popup form, and modal form is closed on button close then qt releases
//popup form automatically, so all we have todo is inform LCL.
if Assigned(LCLObject) and (LCLObject.Parent = nil) and not IsMdiChild then
begin
Widget := nil;
SlotDestroy;
end else
inherited Destroyed;
end;
procedure TQtMainWindow.BeginUpdate;
begin
inherited BeginUpdate;

5
lcl/interfaces/qt6/qtwscontrols.pp
View File

@ -257,7 +257,10 @@ end;
------------------------------------------------------------------------------}
class procedure TQtWSWinControl.DestroyHandle(const AWinControl: TWinControl);
begin
TQtWidget(AWinControl.Handle).Release;
if not WSCheckHandleAllocated(AWinControl, 'DestroyHandle') then
Exit;
if QtWidgetSet.IsValidHandle(AWinControl.Handle) then
TQtWidget(AWinControl.Handle).Release;
end;
{------------------------------------------------------------------------------

10
lcl/interfaces/qt6/qtwsforms.pp
View File

@ -626,7 +626,9 @@ begin
APopupParent := TCustomForm(AWinControl).GetRealPopupParent;
if (APopupParent <> nil) then
begin
Widget.setParent(TQtWidget(APopupParent.Handle).Widget);
//attach destroy event to PopupParent.Handle.Widget via signal on Widget
//use setRealPopupParent, issue #41433
Widget.setRealPopupParent(TQtWidget(APopupParent.Handle).Widget);
Widget.setWindowFlags(Widget.windowFlags or QtDialog); // issue #41241
end;
end;
@ -641,6 +643,12 @@ begin
end;
Widget.setVisible(AWinControl.HandleObjectShouldBeVisible);
if not AWinControl.HandleObjectShouldBeVisible then
begin
// issue #41433
if Widget.PopupParent <> nil then
Widget.setRealPopupParent(nil);
end;
Widget.EndUpdate;
{$IFDEF HASX11}