From 947703a391d9d96579465a150661236c7c994c18 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Tue, 27 Apr 2010 10:44:13 +0000
Subject: [PATCH] LCL: fixed simple dock move

git-svn-id: trunk@25002 -
---
 examples/dockmanager/elasticsite/MakeSite.lpi |  4 ----
 lcl/include/dragmanager.inc                   | 23 +++++++++++--------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/examples/dockmanager/elasticsite/MakeSite.lpi b/examples/dockmanager/elasticsite/MakeSite.lpi
index b1b17ae5de..872c21ee0a 100644
--- a/examples/dockmanager/elasticsite/MakeSite.lpi
+++ b/examples/dockmanager/elasticsite/MakeSite.lpi
@@ -62,11 +62,7 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)\"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
-      <LCLWidgetType Value="win32"/>
     </SearchPaths>
-    <CodeGeneration>
-      <TargetOS Value="win32"/>
-    </CodeGeneration>
     <Other>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
diff --git a/lcl/include/dragmanager.inc b/lcl/include/dragmanager.inc
index d344d7a46b..c4b98e815c 100644
--- a/lcl/include/dragmanager.inc
+++ b/lcl/include/dragmanager.inc
@@ -492,8 +492,9 @@ 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
+      if ADockObjectCopy.Control.Floating and ADockObjectCopy.Floating then
       begin
+        DebugLn(['TDockPerformer.DragStop SIMPLE MOVE']);
         // just move
         AControl:=ADockObjectCopy.Control;
         if AControl.Parent<>nil then
@@ -513,16 +514,18 @@ 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)
-      else
-      if ADockObjectCopy.DragTarget = nil then
-        Accepted := True
-      else
-      if ADockObjectCopy.Control.HostDockSite = nil then
-        Accepted := True;
+      if not Moved then begin
+        if ADockObjectCopy.Control.HostDockSite <> nil then
+          Accepted := ADockObjectCopy.Control.HostDockSite.DoUnDock(TWinControl(ADockObjectCopy.DragTarget), ADockObjectCopy.Control)
+        else
+        if ADockObjectCopy.DragTarget = nil then
+          Accepted := True
+        else
+        if ADockObjectCopy.Control.HostDockSite = nil then
+          Accepted := True;
+      end;
     end;
 
     if (ADockObjectCopy.DragTarget <> nil) and