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

LCL: Enable floating toolbar to dock back to original coolbar after undocking from it (patch by Andrey Zubarev), Issue #0032027

Browse Source 
git-svn-id: trunk@55447 -
This commit is contained in:
wp 2017-07-04 21:42:13 +00:00
parent d6695a1eba
commit 73921e08ee
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lcl/include/dragmanager.inc
View File

@ -365,6 +365,29 @@ procedure TDockPerformer.DragMove(APosition: TPoint);
ARect: TRect;
I: Integer;
j: Integer;
function HaveMultiplePotentialDockClient(AControl: TWinControl):boolean;
var
I,Count:Integer;
begin
Count := 0;
for I := 0 to AControl.ControlCount - 1 do
begin
if (AControl.Controls[I].DragKind = dkDock) and (AControl.Controls[I].DragMode = dmAutomatic) then
inc(Count);
if Count > 1 then exit(True);
end;
Result:=False;
end;
function ItCanBeHostSite:boolean;
begin
if FDockObject.Control.HostDockSite <> nil then
result := (FDockObject.Control.HostDockSite <> AControl) or (AControl.VisibleDockClientCount > 1)
else
result := (AControl <> FDockObject.Control.Parent) or HaveMultiplePotentialDockClient(AControl);
end;
begin
Result := nil;
@ -383,7 +406,7 @@ procedure TDockPerformer.DragMove(APosition: TPoint);
if AControl=FDockObject.Control then continue;
if IsControlChildOfClient(AControl) then continue;
if (FDockObject.Control.HostDockSite <> AControl) or (AControl.VisibleDockClientCount > 1) then
if ItCanBeHostSite then
begin
CanDock := True;
AControl.GetSiteInfo(FDockObject.Control, ARect, APosition, CanDock);