Changeset 436

Timestamp:

Nov 19, 2012, 2:32:37 PM (12 years ago)

Author:

chronos

Message:

• Modified: Better handlig of TCoolBar resize.

File:

• CoolBar/UCoolBar.pas (modified) (12 diffs)

CoolBar/UCoolBar.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Contnrs, Controls, SpecializedList;
+  Classes, SysUtils, Controls, SpecializedList, Dialogs, ComCtrls, Forms;
 
 type
@@ -36 +36 @@
     FBands: TListObject;
     FRowSize: Integer;
+    DisableResize: Boolean;
     function GetBand(Index: Integer): TCoolBand;
     procedure SetBand(Index: Integer; AValue: TCoolBand);
     procedure BandsUpdate(Sender: TObject);
+    procedure AsyncResize(Param: PtrInt);
+    procedure ControlResize(Sender: TObject);
     procedure SetRowSize(AValue: Integer);
+    function SearchBand(Control: TControl): TCoolBand;
+  protected
     procedure Paint; override;
-    function SearchBand(Control: TControl): TCoolBand;
     procedure Resize; override;
   public
@@ -56 +60 @@
     property Color;
     property RowSize: Integer read FRowSize write SetRowSize;
+    property OnResize;
   end;
 
@@ -116 +121 @@
 end;
 
+procedure TCoolBar.AsyncResize(Param: PtrInt);
+begin
+  Arrange;
+end;
+
+procedure TCoolBar.ControlResize(Sender: TObject);
+begin
+  Application.QueueAsyncCall(AsyncResize, 0);
+end;
+
 procedure TCoolBar.SetRowSize(AValue: Integer);
 begin
@@ -133 +148 @@
 begin
   inherited InsertControl(AControl, Index);
-  NewBand := TCoolBand(FBands.AddNew(TCoolBand.Create));
+  AControl.Align := alCustom;
+  NewBand := TCoolBand.Create;
   NewBand.FCoolBar := Self;
   NewBand.Control := AControl;
+  NewBand.Control.OnResize := ControlResize;
+  FBands.Insert(Index, NewBand);
   Arrange;
 end;
@@ -145 +163 @@
   Band := SearchBand(AControl);
   FBands.Remove(Band);
+  AControl.OnResize := nil;
   inherited RemoveControl(AControl);
   Arrange;
@@ -162 +181 @@
 begin
   inherited Resize;
-//  Arrange;
+  //if not DisableResize then Arrange;
 end;
 
@@ -178 +197 @@
 destructor TCoolBar.Destroy;
 begin
-  FBands.Free;
+  FreeAndNil(FBands);
   inherited;
 end;
@@ -188 +207 @@
   NewHeight: Integer;
 begin
+  try
+    DisableResize := True;
   X := 0;
   Y := 0;
@@ -194 +215 @@
     if Assigned(Control) and Control.Visible then begin
       if (CoolBar.Width - X) > Control.Width then begin
+        // Place CoolBand right to the previous
         if (Control.Left <> X) or (Control.Top <> Y) or
           (Control.Width <> Control.Width) or (Control.Height <> RowSize) then
@@ -199 +221 @@
         Inc(X, Control.Width);
       end else begin
+        // CoolBand do not fit in gap, place to next row
+        if I > 0 then begin
+          // Enlarge previous band
+          with TCoolBand(FBands[I - 1]).Control do begin
+            SetBounds(Left, Top, CoolBar.Width - Left, Height);
+          end;
+        end;
         Inc(Y, RowSize);
         X := 0;
@@ -212 +241 @@
     else NewHeight := RowSize;
   if NewHeight <> Height then Height := NewHeight;
+  finally
+    DisableResize := False;
+  end;
 end;