paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-06 17:00:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: fixed simple dock move

Browse Source 
git-svn-id: trunk@25002 -
This commit is contained in:
mattias 2010-04-27 10:44:13 +00:00
parent c0ba48b490
commit 947703a391
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/dockmanager/elasticsite/MakeSite.lpi
View File

@ -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>

23
lcl/include/dragmanager.inc
View File

@ -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