* Fixed crash when TToolbar.ButtonHeight = 0

* TToolbar.ButtonHeight overrules TToolbutton.Autosize (when > 0)
* Fixed caption update when TToolbar.Autosize = False
* Fixed setting Toolbutton size when alignment allowes

git-svn-id: trunk@14909 -

lcl/comctrls.pp

@@ -1395,6 +1395,7 @@ type
     procedure MouseLeave; override;
     procedure Notification(AComponent: TComponent; Operation: TOperation); override;
     procedure Paint; override;
+    procedure TextChanged; override;
     procedure CalculatePreferredSize(
                          var PreferredWidth, PreferredHeight: integer;
                          WithThemeSpace: Boolean); override;
@@ -1414,6 +1415,9 @@ type
     procedure Click; override;
     procedure GetCurrentIcon(var ImageList: TCustomImageList;
                              var TheIndex: integer); virtual;
+    procedure GetPreferredSize(var PreferredWidth, PreferredHeight: integer;
+                               Raw: boolean = false;
+                               WithThemeSpace: boolean = true); override;
     property Index: Integer read GetIndex;
   published
     property Action;

lcl/include/toolbar.inc

@@ -24,16 +24,18 @@ var
   ToolBar: TToolBar;
   Row1: Integer;
   Row2: Integer;
-  BtnHeight: Integer;
+  HalfBtnHeight, BtnHeight: Integer;
 begin
   Result:=0;
   if not (Control1.Parent is TToolBar) then Exit;
 
   ToolBar := TToolBar(Control1.Parent);
   BtnHeight := ToolBar.FRealizedButtonHeight;
+  if BtnHeight <= 0 then BtnHeight := 1;
+  HalfBtnHeight := BtnHeight div 2;
 
-  Row1:=(Control1.Top+(BtnHeight div 2)) div ToolBar.FRealizedButtonHeight;
+  Row1 := (Control1.Top + HalfBtnHeight) div BtnHeight;
-  Row2:=(Control2.Top+(BtnHeight div 2)) div ToolBar.FRealizedButtonHeight;
+  Row2 := (Control2.Top + HalfBtnHeight) div BtnHeight;
   if Row1<Row2 then
     Result:=-1
   else if Row1>Row2 then
@@ -362,35 +364,49 @@ var
   NewWidth: Integer;
   NewHeight: Integer;
   i: Integer;
-  CurButton: TToolButton;
+  ChangeW, ChangeH: Boolean;
 begin
-  if (FButtonWidth=NewButtonWidth) and (FButtonHeight=NewButtonHeight) then
+  ChangeW := FButtonWidth <> NewButtonWidth;
-    exit;
+  ChangeH := FButtonHeight <> NewButtonHeight;
+  if not (ChangeW or ChangeH) then Exit;
+  
   FButtonWidth:=NewButtonWidth;
   FButtonHeight:=NewButtonHeight;
-  if ([csLoading,csDestroying]*ComponentState<>[]) or (FUpdateCount > 0) then
+  if FUpdateCount > 0 then Exit;
-    Exit;
+  if [csLoading, csDestroying] * ComponentState <> [] then Exit;
+
   // set all childs to ButtonWidth ButtonHeight
   BeginUpdate;
   try
-    for i:=ControlCount-1 downto 0 do begin
+    for i:=ControlCount-1 downto 0 do
-      CurControl:=Controls[i];
+    begin
-      if (CurControl.Align<>alNone) then continue;
+      CurControl := Controls[i];
-      NewWidth:=CurControl.Width;
+      NewWidth := CurControl.Width;
-      if (CurControl is TToolButton) and (not CurControl.AutoSize) then begin
+      NewHeight := CurControl.Height;
-        CurButton:=TToolButton(CurControl);
+
-        if CurButton.Style in [tbsButton,tbsCheck,tbsDropDown] then begin
+      // width
+      if ChangeW
+      and (ButtonWidth > 0)
+      and not CurControl.AutoSize
+      and (CurControl is TToolButton)
+      and (CurControl.Align in [alNone, alLeft, alRight])
+      then begin
+        if TToolButton(CurControl).Style in [tbsButton,tbsCheck,tbsDropDown]
+        then begin
           CurControl.GetPreferredSize(NewWidth,NewHeight);
-          if NewWidth<FButtonWidth then
+          if NewWidth < ButtonWidth then
-            NewWidth:=FButtonWidth;
+            NewWidth := ButtonWidth;
         end;
       end;
-      if CurControl.AutoSize then
+      
-        NewHeight:=CurControl.Height
+      // height
-      else
+      // in horizontal toolbars the height is set by the toolbar independent of autosize
-        NewHeight:=FButtonHeight;
+      if ChangeH
-      CurControl.SetBounds(CurControl.Left,CurControl.Top,
+      and (ButtonHeight > 0)
-                           NewWidth,NewHeight);
+      and ((Align in [alTop, alBottom]) or not CurControl.AutoSize)
+      then NewHeight := ButtonHeight;
+        
+      CurControl.SetBounds(CurControl.Left, CurControl.Top, NewWidth, NewHeight);
     end;
   finally
     EndUpdate;
@@ -433,9 +449,8 @@ var
   y: Integer;
   NewControlWidth: Integer;
   CurControl: TControl;
-  AlignedControls: TList;
+  AlignedControls: TFPList;
   StartX: Integer;
-  OrderedControls: TList;
   w: LongInt;
   h: LongInt;
 
@@ -458,9 +473,11 @@ var
       NewControlWidth:=PreferredBtnWidth;
       if NewControlWidth<ButtonWidth then
         NewControlWidth:=ButtonWidth;
-    end else
+    end
+    else
       NewControlWidth:=CurControl.Width;
     NewBounds:=Bounds(x,y,NewControlWidth,ButtonHeight);
+    
     repeat
       // move control to the right, until it does not overlap
       for j:=0 to AlignedControls.Count-1 do begin
@@ -493,6 +510,7 @@ var
   end;
 
 var
+  OrderedControls: TFPList;
   CurClientRect: TRect;
   AdjustClientFrame: TRect;
   i: Integer;
@@ -501,8 +519,8 @@ begin
   Result:=true;
   NewWidth:=0;
   NewHeight:=0;
-  AlignedControls:=TList.Create;
+  AlignedControls:=TFPList.Create;
-  OrderedControls:=TList.Create;
+  OrderedControls:=TFPList.Create;
   DisableAlign;
   BeginUpdate;
   try
@@ -532,19 +550,24 @@ begin
     x:=StartX;
     y:=ARect.Top;
     i:=0;
-    NewControlWidth:=ButtonWidth;
+    while i<OrderedControls.Count do
-    while i<OrderedControls.Count do begin
+    begin
-      CurControl:=TControl(OrderedControls[i]);
+      CurControl := TControl(OrderedControls[i]);
-      if CurControl.Align=alNone then begin
+
       CalculatePosition;
       //DebugLn('WrapButtons ',CurControl.Name,':',CurControl.ClassName,' ',x,',',y,',',CurControl.Width,',',CurControl.Height);
-        if CurControl.AutoSize then begin
+      if ButtonHeight <= 0
+      then h := CurControl.Height
+      else h := ButtonHeight;
+      if CurControl.AutoSize
+      then begin
         // TODO: center vertically
         w:=CurControl.Width;
-          h:=CurControl.Height;
+        if not (align in [alTop, alBottom])
-        end else begin
+        then h := CurControl.Height; // buttonheight overrules autosize in hor toolbar
+      end
+      else begin
         w:=NewControlWidth;
-          h:=ButtonHeight;
       end;
       w:=CurControl.Constraints.MinMaxWidth(w);
       h:=CurControl.Constraints.MinMaxWidth(h);
@@ -568,7 +591,7 @@ begin
         x:=StartX;
         inc(y,ButtonHeight);
       end;
-      end;
+
       inc(i);
     end;
     FRealizedButtonHeight:=FButtonHeight;

lcl/include/toolbutton.inc

@@ -591,6 +591,14 @@ begin
     RefreshControl;
 end;
 
+procedure TToolButton.TextChanged;
+begin
+  inherited TextChanged;
+  if FToolbar = nil then Exit;
+  if FToolbar.ShowCaptions
+  then Invalidate;
+end;
+
 procedure TToolButton.SetMouseInControl(NewMouseInControl: Boolean);
 begin
   //DebugLn('TToolButton.SetMouseInControl A ',Name,' Old=',FMouseInControl,' New=',NewMouseInControl);
@@ -658,6 +666,17 @@ begin
     Result := -1;
 end;
 
+procedure TToolButton.GetPreferredSize(var PreferredWidth, PreferredHeight: integer; Raw: boolean; WithThemeSpace: boolean);
+begin
+  inherited GetPreferredSize(PreferredWidth, PreferredHeight, Raw, WithThemeSpace);
+
+  if FToolbar = nil then Exit;
+  if FToolbar.ButtonHeight <= 0 then Exit;
+  // buttonheight overrules in hor toolbar
+  if FToolbar.Align in [alTop, alBottom]
+  then PreferredHeight := FToolbar.ButtonHeight;
+end;
+
 function TToolButton.IsWidthStored: Boolean;
 begin
   Result := Style in [tbsSeparator, tbsDivider];