From 59646e67d2d100e6979adaf8a1c1cb07c7a790b7 Mon Sep 17 00:00:00 2001 From: blikblum Date: Mon, 15 Dec 2008 23:14:45 +0000 Subject: [PATCH] * Skip unecessary call to AdjustAutoSize in Loaded git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@636 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/virtualtreeview-unstable/VirtualTrees.pas | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/components/virtualtreeview-unstable/VirtualTrees.pas b/components/virtualtreeview-unstable/VirtualTrees.pas index a06e4da17..496f729d4 100644 --- a/components/virtualtreeview-unstable/VirtualTrees.pas +++ b/components/virtualtreeview-unstable/VirtualTrees.pas @@ -17454,8 +17454,9 @@ begin // Because of the special recursion and update stopper when creating the window (or resizing it) // we have to manually trigger the auto size calculation here. + //lcl: Call with Force argument to true since AdjustAutoSize is not called in Loaded if hoAutoResize in FHeader.FOptions then - FHeader.FColumns.AdjustAutoSize(InvalidColumn); + FHeader.FColumns.AdjustAutoSize(InvalidColumn, True); // Initialize flat scroll bar library if required. {$ifdef UseFlatScrollbars} @@ -21756,10 +21757,13 @@ begin FHeader.UpdateMainColumn; FHeader.FColumns.FixPositions; if toAutoBidiColumnOrdering in FOptions.FAutoOptions then - FHeader.FColumns.ReorderColumns(UseRightToLeftAlignment); + FHeader.FColumns.ReorderColumns(UseRightToLeftAlignment); FHeader.RecalculateHeader; - if hoAutoResize in FHeader.FOptions then - FHeader.FColumns.AdjustAutoSize(InvalidColumn, True); + //lclheader + //AdjustAutoSize is called inside CreateWnd. Don't call here + //Keep the commented code until we get sure of not being necessary + //if hoAutoResize in FHeader.FOptions then + // FHeader.FColumns.AdjustAutoSize(InvalidColumn, True); finally Updated; end;