From b7b1d4240178bae7cb340957c5af97a7593fef08 Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Wed, 6 Mar 2013 16:43:45 +0000
Subject: [PATCH] LCL, CoolBar: Revert FControl.Align back to alNone. Set
 control width also when autosizing.

git-svn-id: trunk@40497 -
---
 lcl/include/coolbar.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lcl/include/coolbar.inc b/lcl/include/coolbar.inc
index 362c9276e6..9ac1acc09f 100644
--- a/lcl/include/coolbar.inc
+++ b/lcl/include/coolbar.inc
@@ -169,7 +169,6 @@ end;
 procedure TCoolBand.SetControlWidth;
 begin
   if FControl is TCustomCheckBox then Exit;
-  if FCoolBar.AutoSize then Exit;
   if FCoolBar.BiDiMode = bdLeftToRight then
     FControl.Width := Width - FControl.Left - 6
   else if Assigned(FTextLabel) then
@@ -181,6 +180,7 @@ end;
 procedure TCoolBand.UpdControl(aLabelWidth: integer);
 begin
   if FCoolBar = Nil then Exit;
+  Inc(FCoolBar.FUpdateCount);
   if Assigned(FTextLabel) then
   begin
     if Assigned(FControl) then
@@ -196,7 +196,7 @@ begin
   if Assigned(FControl) then
   begin
     // Calculate left positions and anchoring for text label and control
-    FControl.Align := alCustom;
+    FControl.Align := alNone; // alCustom does not work here
     FControl.Parent := FCoolBar;
     FControl.FreeNotification(FCoolBar);
     FControl.Top := FTop;
@@ -225,6 +225,7 @@ begin
     FControl.AnchorSide[akTop].Control := Nil;
     SetControlWidth;
   end;
+  Dec(FCoolBar.FUpdateCount);
 end;
 
 procedure TCoolBand.SetControl(aValue: TControl);