Changeset 62

Timestamp:

Sep 29, 2010, 9:34:34 AM (14 years ago)

Author:

george

Message:

• Upraveno: Zamezení ihned startu kotvení záložky při pokliku na záložku.

Location:

Docking/CoolDocking

Files:

• Demo/Demo.lpi (modified) (3 diffs)
• Demo/UMainForm.pas (modified) (1 diff)
• UCoolDocking.pas (modified) (6 diffs)

Docking/CoolDocking/Demo/Demo.lpi

@@ -54 +54 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UMainForm"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="4"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="79"/>
-        <CursorPos X="19" Y="92"/>
+        <TopLine Value="58"/>
+        <CursorPos X="3" Y="71"/>
         <UsageCount Value="126"/>
         <Loaded Value="True"/>
@@ -339 +340 @@
         <Filename Value="..\UCoolDocking.pas"/>
         <UnitName Value="UCoolDocking"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
         <WindowIndex Value="0"/>
         <TopLine Value="899"/>
-        <CursorPos X="76" Y="904"/>
+        <CursorPos X="20" Y="912"/>
         <UsageCount Value="53"/>
         <Loaded Value="True"/>
@@ -523 +523 @@
         <TopLine Value="126"/>
         <CursorPos X="89" Y="147"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="11"/>
         <Loaded Value="True"/>
       </Unit53>

Docking/CoolDocking/Demo/UMainForm.pas

@@ -64 +64 @@
 begin
   NewDockForm.ManualDock(Panel1);
- // NewDockForm.ManualDock(Panel1);
-  //ConjoinedDockForm1 := TCoolDockManager(Panel1.DockManager).CreateContainer(alRight);
-  //ConjoinedDockForm1.Name := 'Model';;
-  //TCoolDockManager(ConjoinedDockForm1.Panel.DockManager).TabsPos := hpLeft;
-  //ConjoinedDockForm1.ManualDock(Panel1);
-  //TCoolDockManager(ConjoinedDockForm1.Panel.DockManager).DockStyle := dsTabs;
+  NewDockForm.ManualDock(Panel1);
+  ConjoinedDockForm1 := TCoolDockManager(Panel1.DockManager).CreateContainer(alRight);
+  ConjoinedDockForm1.Name := 'Model';;
+  TCoolDockManager(ConjoinedDockForm1.Panel.DockManager).TabsPos := hpLeft;
+  ConjoinedDockForm1.ManualDock(Panel1);
+  TCoolDockManager(ConjoinedDockForm1.Panel.DockManager).DockStyle := dsTabs;
   (*NewDockForm.ManualDock(ConjoinedDockForm1.Panel);
   NewDockForm.ManualDock(ConjoinedDockForm1.Panel);

Docking/CoolDocking/UCoolDocking.pas

@@ -84 +84 @@
   TCoolDockManager = class(TDockManager)
   private
+    MouseDown: Boolean;
+    MouseButton: TMouseButton;
     FMaster: TCoolDockMaster;
     FMoveDuration: Integer;
@@ -105 +107 @@
     procedure SetMoveDuration(const AValue: Integer);
     procedure SetTabsPos(const AValue: THeaderPos);
+    procedure TabControlMouseLeave(Sender: TObject);
+    procedure TabControlChange(Sender: TObject);
+    procedure TabControlMouseDown(Sender: TObject; Button: TMouseButton;
+      Shift: TShiftState; X, Y: Integer);
+    procedure TabControlMouseUp(Sender: TObject; Button: TMouseButton;
+      Shift: TShiftState; X, Y: Integer);
     procedure UpdateClientSize;
-    procedure TabControlChange(Sender: TObject);
     procedure PopupMenuListClick(Sender: TObject);
     procedure PopupMenuTabsClick(Sender: TObject);
@@ -119 +126 @@
     procedure PopupMenuCustomizeClick(Sender: TObject);
     procedure Timer1Timer(Sender: TObject);
-    procedure TabControlMouseDown(Sender: TObject; Button: TMouseButton;
-      Shift: TShiftState; X, Y: Integer);
   public
     constructor Create(ADockSite: TWinControl); override;
@@ -290 +295 @@
 end;
 
+procedure TCoolDockManager.TabControlMouseLeave(Sender: TObject);
+begin
+  if MouseDown then
+  if (TabControl.TabIndex <> -1) then begin
+    TCoolDockClientPanel(FDockPanels[TabControl.TabIndex]).ClientAreaPanel.DockSite := False;
+    DragManager.DragStart(TCoolDockClientPanel(FDockPanels[TabControl.TabIndex]).Control, False, 1);
+  end;
+  MouseDown := False;
+end;
+
 constructor TCoolDockManager.Create(ADockSite: TWinControl);
 var
@@ -448 +463 @@
     OnChange := TabControlChange;
     PopupMenu := PopupMenuTabs;
-    //OnMouseDown := TabControlMouseDown;
+    TTabControlNoteBookStrings(Tabs).NoteBook.OnMouseLeave := TabControlMouseLeave;
     TTabControlNoteBookStrings(Tabs).NoteBook.OnMouseDown := TabControlMouseDown;
+    TTabControlNoteBookStrings(Tabs).NoteBook.OnMouseUp := TabControlMouseUp;
     Images := TabImageList;
   end;
@@ -901 +917 @@
       Shift: TShiftState; X, Y: Integer);
 begin
-  if (Button = mbLeft) and (TabControl.TabIndex <> -1) then begin
-    TCoolDockClientPanel(FDockPanels[TabControl.TabIndex]).ClientAreaPanel.DockSite := False;
-    DragManager.DragStart(TCoolDockClientPanel(FDockPanels[TabControl.TabIndex]).Control, False, 1);
-  end;
+  MouseDown := True;
+  MouseButton := Button;
+end;
+
+procedure TCoolDockManager.TabControlMouseUp(Sender: TObject;
+  Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
+begin
+  MouseDown := False;
 end;