Changeset 204 for Docking/CoolDocking/Managers/UCDManagerTabsPopup.pas

Timestamp:

Mar 17, 2011, 11:11:36 AM (13 years ago)

Author:

george

Message:

• Modified: Better tabs popup animation.

File:

• Docking/CoolDocking/Managers/UCDManagerTabsPopup.pas (modified) (12 diffs)

Docking/CoolDocking/Managers/UCDManagerTabsPopup.pas

@@ -7 +7 @@
 uses
   Classes, Controls, SysUtils, ComCtrls, ExtCtrls, UCDCommon, UCDManager,
-  UCDManagerTabs, Forms;
+  UCDManagerTabs, Forms, URectangle;
 
 type
@@ -17 +17 @@
     FStepCount: Integer;
     FTabPosition: TTabPosition;
-    StartBounds: TRect;
+    ControlBounds: TRectangle;
+    HideBounds: TRectangle;
+    ShowBounds: TRectangle;
     procedure SetDuration(const AValue: Real);
     procedure SetStepCount(const AValue: Integer);
@@ -29 +31 @@
     Control: TControl;
     ControlVisible: Boolean;
+    DoShow: Boolean;
     procedure Hide;
     procedure Show;
@@ -81 +84 @@
 begin
   case TabPosition of
+    tpTop: begin
+      Control.SetBounds(ControlBounds.Left, ControlBounds.Top,
+        ControlBounds.Width, Round(ControlBounds.Height * Position));
+    end;
+    tpLeft: begin
+      Control.SetBounds(ControlBounds.Left, ControlBounds.Top,
+        Round(ControlBounds.Width * Position), ControlBounds.Height);
+    end;
+    tpRight: begin
+      Control.SetBounds(ControlBounds.Right -
+        Round(ControlBounds.Width * Position), ControlBounds.Top,
+        Round(ControlBounds.Width * Position), ControlBounds.Height);
+    end;
     tpBottom: begin
-      Control.Height := Round((StartBounds.Bottom - StartBounds.Top) * Position);
-      Control.Top := StartBounds.Bottom - Control.Height;
-    end;
-    tpTop: begin
-      Control.Height := Round((StartBounds.Bottom - StartBounds.Top) * Position);
-    end;
-    tpLeft: begin
-      Control.Width := Round((StartBounds.Right - StartBounds.Left) * Position);
-    end;
-    tpRight: begin
-      Control.Width := Round((StartBounds.Right - StartBounds.Left) * Position);
-      Control.Left := StartBounds.Right - Control.Width;
+      Control.SetBounds(ControlBounds.Left,
+        ControlBounds.Bottom - Round(ControlBounds.Height * Position),
+        ControlBounds.Width, Round(ControlBounds.Height * Position));
     end;
   end;
@@ -119 +126 @@
 procedure TCDAutoHide.Hide;
 begin
-  StartBounds := Control.BoundsRect;
+  HideBounds.AsTRect := Control.BoundsRect;
+  ControlBounds.Assign(HideBounds);
   Control.Show;
   Control.BringToFront;
+  Application.ProcessMessages;
   Direction := -1;
   Position := 1;
@@ -130 +139 @@
 procedure TCDAutoHide.Show;
 begin
-  StartBounds := Control.BoundsRect;
-  //StartBounds := Bounds(0, 0, Control.UndockWidth, Control.UndockHeight);
-  Control.Show;
-  Control.BringToFront;
-  Control.Align := alClient;
-  Direction := 1;
-  Position := 0;
-  Timer.Enabled := True;
-  UpdateBounds;
+  ShowBounds.AsTRect := Control.BoundsRect;
+  ControlBounds.Assign(HideBounds);
+  if Position > 0 then begin
+    DoShow := True;
+    Hide;
+  end else begin
+    //StartBounds := Bounds(0, 0, Control.UndockWidth, Control.UndockHeight);
+    Control.Show;
+    Control.BringToFront;
+    //Control.Align := alClient;
+    Direction := 1;
+    Position := 0;
+    Timer.Enabled := True;
+    UpdateBounds;
+  end;
 end;
 
@@ -144 +159 @@
 begin
   inherited;
+  ShowBounds := TRectangle.Create;
+  HideBounds := TRectangle.Create;
+  ControlBounds := TRectangle.Create;
   Timer := TTimer.Create(nil);
   Timer.Enabled := False;
@@ -149 +167 @@
   StepCount := 10;
   Duration := 0.05;
+  ShowBounds := TRectangle.Create;
 end;
 
 destructor TCDAutoHide.Destroy;
 begin
+  ShowBounds.Free;
+  HideBounds.Free;
+  ControlBounds.Free;
   Timer.Free;
   inherited Destroy;
@@ -165 +187 @@
       Timer.Enabled := False;
       ControlVisible := True;
+      DoShow := False;
+      HideBounds := ShowBounds;
     end;
   end else
@@ -171 +195 @@
     if Position < 0 then begin
       Position := 0;
-      Timer.Enabled := False;
-      ControlVisible := False;
+      if DoShow then begin
+        Direction := 1;
+        ControlBounds.Assign(ShowBounds);
+      end else begin
+        Timer.Enabled := False;
+        ControlVisible := False;
+      end;
     end;
   end;
@@ -194 +223 @@
   Pos: TPoint;
   C: TControl;
+  TopParent: TWinControl;
 begin
   inherited TabControlChange(Sender);
   MouseDownSkip := True;
-  if PopupForm.ControlCount > 0 then
-    PopupForm.Controls[0].Parent := nil;
-  AutoHide.Hide;
-  while AutoHide.Position > 0 do begin
-    Application.ProcessMessages;
-    Sleep(1);
-  end;
+
   if PageControl.TabIndex >= 0 then begin
     C := TCDManagerTabsPopupItem(DockItems[PageControl.TabIndex]).Control;
+    C.Align := alClient;
     C.Parent := PopupForm;
+    Pos := Point(PageControl.Left, PageControl.Top);
+
+    TopParent := DockSite;
+    while Assigned(TopParent.Parent) do begin
+      Pos.X := Pos.X + TopParent.Left;;
+      Pos.Y := Pos.Y + TopParent.Top;
+      TopParent := TopParent.Parent;
+    end;
+    PopupForm.Parent := TopParent;
     //AutoHide.Control.Align := alCustom;
-    Pos := Point(PageControl.Left, PageControl.Top);
-    Pos := DockSite.ClientToScreen(Pos);
+    //Pos := DockSite.ClientToScreen(Pos);
+    C.TBDockHeight := 100;
+    C.LRDockWidth := 100;
     with AutoHide.Control do
     case AutoHide.TabPosition of
@@ -243 +278 @@
   PopupForm.DockManager := TCDManagerRegions.Create(PopupForm);
   PopupForm.Visible := True;
-  //PopupForm.Parent := ADockSite;
   PopupForm.BorderStyle := bsNone;
   AutoHide := TCDAutoHide.Create;