Changeset 218 for Docking/CoolDocking/UCDPopupMenu.pas

Timestamp:

Mar 23, 2011, 12:22:26 PM (13 years ago)

Author:

george

Message:

• Fixed: Parent manager tabs switching.

File:

• Docking/CoolDocking/UCDPopupMenu.pas (modified) (8 diffs)

Docking/CoolDocking/UCDPopupMenu.pas

@@ -208 +208 @@
   if PopupComponent is TCDHeader then
   with TCDHeader(PopupComponent) do begin
-    TForm(ManagerItem.Control).Close;
+    TForm(Control).Close;
   end;
 end;
@@ -227 +227 @@
   if PopupComponent is TCDHeader then
   with TCDHeader(PopupComponent) do begin
-    Value := ManagerItem.Control.Caption;
+    Value := Control.Caption;
     if InputQuery(SRenameWindow, SEnterNewWindowName, False, Value) then begin
-      ManagerItem.Control.Caption := Value;
+      Control.Caption := Value;
       Invalidate;
     end;
@@ -243 +243 @@
   if PopupComponent is TCDHeader then
   with TCDHeader(PopupComponent) do begin
-    TCDManager(TWinControl(ManagerItem.Control).DockManager).HeaderPos := hpTop;
+    TCDManager(TWinControl(Control).DockManager).HeaderPos := hpTop;
     Invalidate;
   end;
@@ -256 +256 @@
   if PopupComponent is TCDHeader then
   with TCDHeader(PopupComponent) do begin
-    TCDManager(TWinControl(ManagerItem.Control).DockManager).HeaderPos := hpLeft;
+    TCDManager(TWinControl(Control).DockManager).HeaderPos := hpLeft;
     Invalidate;
   end;
@@ -269 +269 @@
   if PopupComponent is TCDHeader then
   with TCDHeader(PopupComponent) do begin
-    TCDManager(TWinControl(ManagerItem.Control).DockManager).HeaderPos := hpRight;
+    TCDManager(TWinControl(Control).DockManager).HeaderPos := hpRight;
     Invalidate;
   end;
@@ -282 +282 @@
   if PopupComponent is TCDHeader then
   with TCDHeader(PopupComponent) do begin
-    TCDManager(TWinControl(ManagerItem.Control).DockManager).HeaderPos := hpTop;
+    TCDManager(TWinControl(Control).DockManager).HeaderPos := hpTop;
     Invalidate;
   end;
@@ -295 +295 @@
   if PopupComponent is TCDHeader then
   with TCDHeader(PopupComponent) do begin
-    TCDManager(TWinControl(ManagerItem.Control).DockManager).HeaderPos := hpBottom;
+    TCDManager(TWinControl(Control).DockManager).HeaderPos := hpBottom;
     Invalidate;
   end;
@@ -302 +302 @@
 procedure TCDPopupMenu.PopupMenuUndockClick(Sender: TObject);
 var
-  Control: TControl;
-begin
-  if PopupComponent is TPageControl then
-  with TPageControl(PopupComponent) do begin
-    Control := TCDManagerTabsItem(TCDManagerTabs(Manager).DockItems[TabIndex]).Control;
-  end else
-  if PopupComponent is TCDHeader then
-  with TCDHeader(PopupComponent) do begin
-    Control := ManagerItem.Control;
-  end else Control := nil;
-  if Assigned(Control) then
-    Control.ManualFloat(Control.BoundsRect);
+  UndockControl: TControl;
+begin
+  if PopupComponent is TPageControl then
+  with TPageControl(PopupComponent) do begin
+    UndockControl := TCDManagerTabsItem(TCDManagerTabs(Manager).DockItems[TabIndex]).Control;
+  end else
+  if PopupComponent is TCDHeader then
+  with TCDHeader(PopupComponent) do begin
+    UndockControl := Control;
+  end else UndockControl := nil;
+  if Assigned(UndockControl) then
+    UndockControl.ManualFloat(UndockControl.BoundsRect);
 end;