From ddbb0da02ea414b97b45105619d6b33f16184db5 Mon Sep 17 00:00:00 2001 From: ondrej Date: Fri, 1 Jan 2016 08:14:26 +0000 Subject: [PATCH] merge r51097 #bb21c80552: anchordocking: fix dock site main menu changes docked windows height. Issue #18538 git-svn-id: branches/fixes_1_6@51101 - --- components/anchordocking/anchordocking.pas | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/components/anchordocking/anchordocking.pas b/components/anchordocking/anchordocking.pas index a3168047bc..6beec44b8e 100644 --- a/components/anchordocking/anchordocking.pas +++ b/components/anchordocking/anchordocking.pas @@ -517,6 +517,7 @@ type procedure MapTreeToControls(Tree: TAnchorDockLayoutTree); function RestoreLayout(Tree: TAnchorDockLayoutTree; Scale: boolean): boolean; procedure EnableAllAutoSizing; + procedure ResetSplitters; procedure ClearLayoutProperties(AControl: TControl; NewAlign: TAlign = alClient); procedure PopupMenuPopup(Sender: TObject); procedure ChangeLockButtonClick(Sender: TObject); @@ -2090,6 +2091,15 @@ begin AddPopupMenuItem('OptionsMenuItem', adrsDockingOptions, @OptionsClick); 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; Scale: Boolean): Boolean; var @@ -2134,6 +2144,7 @@ begin // commit (this can raise an exception, when it triggers events) EnableAllAutoSizing; end; + ResetSplitters; // reset splitters' DockBounds after EnableAllAutoSizing. fixes issue #18538 {$IFDEF VerboseAnchorDockRestore} DebugWriteChildAnchors(Application.MainForm,true,false); {$ENDIF}