From c0ba48b4909bc1e77fac2dc69489ba64aa212b3b Mon Sep 17 00:00:00 2001 From: mattias Date: Tue, 27 Apr 2010 10:41:47 +0000 Subject: [PATCH] LCL: disabled simple dock move code, something is undocking git-svn-id: trunk@25001 - --- examples/dockmanager/elasticsite/MakeSite.lpi | 4 ++++ examples/dockmanager/elasticsite/fmastersite.pas | 2 -- lcl/include/dragmanager.inc | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/examples/dockmanager/elasticsite/MakeSite.lpi b/examples/dockmanager/elasticsite/MakeSite.lpi index 872c21ee0a..b1b17ae5de 100644 --- a/examples/dockmanager/elasticsite/MakeSite.lpi +++ b/examples/dockmanager/elasticsite/MakeSite.lpi @@ -62,7 +62,11 @@ + + + + diff --git a/examples/dockmanager/elasticsite/fmastersite.pas b/examples/dockmanager/elasticsite/fmastersite.pas index b99911a12d..8e5b9d998f 100644 --- a/examples/dockmanager/elasticsite/fmastersite.pas +++ b/examples/dockmanager/elasticsite/fmastersite.pas @@ -78,9 +78,7 @@ begin //f.Visible := True; //??? if f.HostDockSite <> nil then f := f.HostDockSite; - DebugLn(['TMasterSite.FormCreate AAA1']); f.Top := 300; - DebugLn(['TMasterSite.FormCreate AAA2']); f.Show; DebugLn('Clients: %d', [f.ControlCount]); {$IFDEF TestUnwrapped} diff --git a/lcl/include/dragmanager.inc b/lcl/include/dragmanager.inc index b114ea3371..d344d7a46b 100644 --- a/lcl/include/dragmanager.inc +++ b/lcl/include/dragmanager.inc @@ -491,8 +491,8 @@ begin if ADropped then begin - //DebugLn(['TDockPerformer.DragStop Dropped ',ADockObjectCopy.Control.Floating,' ',ADockObjectCopy.Floating,' ',DbgSName(ADockObjectCopy.Control)]); - if ADockObjectCopy.Control.Floating and ADockObjectCopy.Floating then + DebugLn(['TDockPerformer.DragStop Dropped ',ADockObjectCopy.Control.Floating,' ',ADockObjectCopy.Floating,' ',DbgSName(ADockObjectCopy.Control)]); + {if ADockObjectCopy.Control.Floating and ADockObjectCopy.Floating then begin // just move AControl:=ADockObjectCopy.Control; @@ -513,7 +513,7 @@ begin //DebugLn(['TDockPerformer.DragStop MOVED']); Moved:=true; Accepted:=true; - end; + end;} if ADockObjectCopy.Control.HostDockSite <> nil then Accepted := ADockObjectCopy.Control.HostDockSite.DoUnDock(TWinControl(ADockObjectCopy.DragTarget), ADockObjectCopy.Control)