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

AnchorDocking: Fix save-restore of MainForm.WindowState with TAnchorDockPanel. Issue #32302, patch from Andrey Zubarev.

Browse Source 
git-svn-id: trunk@55712 -
This commit is contained in:
juha 2017-08-20 09:02:32 +00:00
parent 39cf5781b5
commit c2428a4dd1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/anchordocking/anchordocking.pas
View File

@ -1835,11 +1835,14 @@ begin
if (ANode.NodeType<>adltnPages) and (aHostSite.Pages<>nil) then if (ANode.NodeType<>adltnPages) and (aHostSite.Pages<>nil) then
aHostSite.FreePages; aHostSite.FreePages;
end; end;
if Site is TCustomForm then if Site is TCustomForm then begin
if AParent=nil then if AParent=nil then
TCustomForm(Site).WindowState:=ANode.WindowState TCustomForm(Site).WindowState:=ANode.WindowState
else else
TCustomForm(Site).WindowState:=wsNormal; TCustomForm(Site).WindowState:=wsNormal;
end else
GetParentForm(Site).WindowState:=ANode.WindowState;
end; end;
function TAnchorDockMaster.GetNodeSite(Node: TAnchorDockLayoutTreeNode): TAnchorDockHostSite; function TAnchorDockMaster.GetNodeSite(Node: TAnchorDockLayoutTreeNode): TAnchorDockHostSite;

2
components/anchordocking/anchordockstorage.pas
View File

@ -1129,7 +1129,7 @@ begin
Monitor:=TCustomForm(AControl).Monitor.MonitorNum; Monitor:=TCustomForm(AControl).Monitor.MonitorNum;
WorkAreaRect:=TCustomForm(AControl).Monitor.WorkareaRect; WorkAreaRect:=TCustomForm(AControl).Monitor.WorkareaRect;
end else end else
WindowState:=wsNormal; WindowState:=GetParentForm(AControl).WindowState;
if AControl is TCustomTabControl then if AControl is TCustomTabControl then
TabPosition:=TCustomTabControl(AControl).TabPosition TabPosition:=TCustomTabControl(AControl).TabPosition
else else