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

Qt5,Qt6: fixed offset when using docked form editor and form contains main menu.issue #41637

Browse Source
This commit is contained in:
zeljan1 2025-05-13 10:33:35 +02:00
parent 8fb7e57694
commit cb87ad069d
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7624,7 +7624,12 @@ begin
Result := inherited getClientOffset; Result := inherited getClientOffset;
if Assigned(ScrollArea) and Assigned(FMenuBar) and if Assigned(ScrollArea) and Assigned(FMenuBar) and
(FMenuBar.getVisible) then (FMenuBar.getVisible) then
begin
if Assigned(LCLObject) and IsFormDesign(LCLObject) and (LCLObject.Parent <> nil) then
// issue #41637
else
inc(Result.Y, FMenuBar.getHeight); inc(Result.Y, FMenuBar.getHeight);
end;
{$ELSE} {$ELSE}
Result:=inherited getClientOffset; Result:=inherited getClientOffset;
{$ENDIF} {$ENDIF}

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

@ -7544,7 +7544,12 @@ begin
Result := inherited getClientOffset; Result := inherited getClientOffset;
if Assigned(ScrollArea) and Assigned(FMenuBar) and if Assigned(ScrollArea) and Assigned(FMenuBar) and
(FMenuBar.getVisible) then (FMenuBar.getVisible) then
begin
if Assigned(LCLObject) and IsFormDesign(LCLObject) and (LCLObject.Parent <> nil) then
// issue #41637
else
inc(Result.Y, FMenuBar.getHeight); inc(Result.Y, FMenuBar.getHeight);
end;
{$ELSE} {$ELSE}
Result:=inherited getClientOffset; Result:=inherited getClientOffset;
{$ENDIF} {$ENDIF}