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

Qt5: fixed crash with uninitialized menubar. issue #41271

Browse Source
This commit is contained in:
Željan Rikalo 2024-12-09 16:42:55 +01:00
parent 8477f6087d
commit 7ae7202855
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1033,18 +1033,21 @@ begin
if Assigned(TCustomForm(AWinControl).Menu) then
begin
AWin := TQtMainWindow(AWinControl.Handle);
AWin.MenuBar.sizeHint(@ASize);
// geometry isn't updated yet
if ASize.cy < 10 then
ASize.cy := 0;
// we must use real geometry, and then exclude menubar height.
aClientRect := AWin.getGeometry;
Types.OffsetRect(aClientRect, -aClientRect.Left, -aClientRect.Top);
dec(AClientRect.Bottom, ASize.cy);
{$IFDEF VerboseQtResize}
DebugLn('TQtWSCustomForm.getDefaultClientRect ',dbgsName(AWinControl),' ',dbgs(AWin.getClientBounds),' mnuBarHeight ',dbgs(AWin.MenuBar.getHeight),' ASize=',dbgs(ASize),' FINAL=',dbgs(AClientRect));
{$ENDIF}
Result := True;
if Assigned(AWin.MenuBar) then
begin
AWin.MenuBar.sizeHint(@ASize);
// geometry isn't updated yet
if ASize.cy < 10 then
ASize.cy := 0;
// we must use real geometry, and then exclude menubar height.
aClientRect := AWin.getGeometry;
Types.OffsetRect(aClientRect, -aClientRect.Left, -aClientRect.Top);
dec(AClientRect.Bottom, ASize.cy);
{$IFDEF VerboseQtResize}
DebugLn('TQtWSCustomForm.getDefaultClientRect ',dbgsName(AWinControl),' ',dbgs(AWin.getClientBounds),' mnuBarHeight ',dbgs(AWin.MenuBar.getHeight),' ASize=',dbgs(ASize),' FINAL=',dbgs(AClientRect));
{$ENDIF}
Result := True;
end;
end;
end;
end;