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

merge r51097 #bb21c80552: anchordocking: fix dock site main menu changes docked windows height. Issue #18538

Browse Source 
git-svn-id: branches/fixes_1_6@51101 -
This commit is contained in:
ondrej 2016-01-01 08:14:26 +00:00
parent 21578de506
commit ddbb0da02e
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/anchordocking/anchordocking.pas
View File

@ -517,6 +517,7 @@ type
procedure MapTreeToControls(Tree: TAnchorDockLayoutTree); procedure MapTreeToControls(Tree: TAnchorDockLayoutTree);
function RestoreLayout(Tree: TAnchorDockLayoutTree; Scale: boolean): boolean; function RestoreLayout(Tree: TAnchorDockLayoutTree; Scale: boolean): boolean;
procedure EnableAllAutoSizing; procedure EnableAllAutoSizing;
procedure ResetSplitters;
procedure ClearLayoutProperties(AControl: TControl; NewAlign: TAlign = alClient); procedure ClearLayoutProperties(AControl: TControl; NewAlign: TAlign = alClient);
procedure PopupMenuPopup(Sender: TObject); procedure PopupMenuPopup(Sender: TObject);
procedure ChangeLockButtonClick(Sender: TObject); procedure ChangeLockButtonClick(Sender: TObject);
@ -2090,6 +2091,15 @@ begin
AddPopupMenuItem('OptionsMenuItem', adrsDockingOptions, @OptionsClick); AddPopupMenuItem('OptionsMenuItem', adrsDockingOptions, @OptionsClick);
end; end;
procedure TAnchorDockMaster.ResetSplitters;
var
I: Integer;
begin
for I := 0 to ComponentCount-1 do
if Components[I] is TAnchorDockSplitter then
TAnchorDockSplitter(Components[I]).UpdateDockBounds;
end;
function TAnchorDockMaster.FullRestoreLayout(Tree: TAnchorDockLayoutTree; function TAnchorDockMaster.FullRestoreLayout(Tree: TAnchorDockLayoutTree;
Scale: Boolean): Boolean; Scale: Boolean): Boolean;
var var
@ -2134,6 +2144,7 @@ begin
// commit (this can raise an exception, when it triggers events) // commit (this can raise an exception, when it triggers events)
EnableAllAutoSizing; EnableAllAutoSizing;
end; end;
ResetSplitters; // reset splitters' DockBounds after EnableAllAutoSizing. fixes issue #18538
{$IFDEF VerboseAnchorDockRestore} {$IFDEF VerboseAnchorDockRestore}
DebugWriteChildAnchors(Application.MainForm,true,false); DebugWriteChildAnchors(Application.MainForm,true,false);
{$ENDIF} {$ENDIF}