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

LCL: comments

Browse Source 
git-svn-id: trunk@25796 -
This commit is contained in:
mattias 2010-05-31 07:21:19 +00:00
parent da350323d4
commit e2ad22aaa0
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/controls.pp
View File

@ -1766,7 +1766,7 @@ type
function DoDragMsg(ADragMessage: TDragMessage; APosition: TPoint; function DoDragMsg(ADragMessage: TDragMessage; APosition: TPoint;
ADragObject: TDragObject; ATarget: ADragObject: TDragObject; ATarget:
TControl; ADocking: Boolean): LRESULT; override; TControl; ADocking: Boolean): LRESULT; override;
function DoDockClientMsg(DragDockObject: TDragDockObject; Position: TPoint): boolean; virtual; function DoDockClientMsg(DragDockObject: TDragDockObject; aPosition: TPoint): boolean; virtual;
function DoUndockClientMsg(NewTarget, Client: TControl):boolean; virtual; function DoUndockClientMsg(NewTarget, Client: TControl):boolean; virtual;
procedure DoAddDockClient(Client: TControl; const ARect: TRect); virtual; procedure DoAddDockClient(Client: TControl; const ARect: TRect); virtual;
procedure DockOver(Source: TDragDockObject; X, Y: Integer; procedure DockOver(Source: TDragDockObject; X, Y: Integer;

3
lcl/include/control.inc
View File

@ -1109,7 +1109,8 @@ end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
TControl.DoDragMsg TControl.DoDragMsg
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
function TControl.DoDragMsg(ADragMessage: TDragMessage; APosition: TPoint; ADragObject: TDragObject; ATarget: TControl; ADocking: Boolean): LRESULT; function TControl.DoDragMsg(ADragMessage: TDragMessage; APosition: TPoint;
ADragObject: TDragObject; ATarget: TControl; ADocking: Boolean): LRESULT;
function GetDragObject: TObject; inline; function GetDragObject: TObject; inline;
begin begin

11
lcl/include/dragmanager.inc
View File

@ -543,9 +543,11 @@ begin
{$ENDIF} {$ENDIF}
end; end;
// undock
if not Moved then begin if not Moved then begin
if ADockObjectCopy.Control.HostDockSite <> nil then if ADockObjectCopy.Control.HostDockSite <> nil then
Accepted := ADockObjectCopy.Control.HostDockSite.DoUnDock(TWinControl(ADockObjectCopy.DragTarget), ADockObjectCopy.Control) Accepted := ADockObjectCopy.Control.HostDockSite.DoUnDock(
TWinControl(ADockObjectCopy.DragTarget), ADockObjectCopy.Control)
else else
if ADockObjectCopy.DragTarget = nil then if ADockObjectCopy.DragTarget = nil then
Accepted := True Accepted := True
@ -563,6 +565,7 @@ begin
Accepted := Accepted and (Moved or ADockObjectCopy.Floating or SendCmDragMsg(ADockObjectCopy, dmDragLeave)) and ADropped; Accepted := Accepted and (Moved or ADockObjectCopy.Floating or SendCmDragMsg(ADockObjectCopy, dmDragLeave)) and ADropped;
ADockObjectCopy.FDropped := Accepted; ADockObjectCopy.FDropped := Accepted;
// float
if Accepted and (not Moved) and ADockObjectCopy.Floating then if Accepted and (not Moved) and ADockObjectCopy.Floating then
begin begin
ParentForm := GetParentForm(ADockObjectCopy.Control); ParentForm := GetParentForm(ADockObjectCopy.Control);
@ -572,7 +575,7 @@ begin
ADockObjectCopy.Control.DoFloatMsg(ADockObjectCopy); ADockObjectCopy.Control.DoFloatMsg(ADockObjectCopy);
end; end;
// dock
if ADockObjectCopy.DragTarget <> nil then if ADockObjectCopy.DragTarget <> nil then
begin begin
if not Accepted then if not Accepted then
@ -585,9 +588,11 @@ begin
end end
else else
DragMsg := dmDragDrop; DragMsg := dmDragDrop;
SendDragMessage(ADockObjectCopy.DragTarget, DragMsg, ADockObjectCopy, ADockObjectCopy.DragTarget, ADockObjectCopy.DragPos); SendDragMessage(ADockObjectCopy.DragTarget, DragMsg, ADockObjectCopy,
ADockObjectCopy.DragTarget, ADockObjectCopy.DragPos);
end; end;
// EndDrag
if not Accepted then if not Accepted then
ADockObjectCopy.Control.DragCanceled; ADockObjectCopy.Control.DragCanceled;
ADockObjectCopy.EndDrag(ADockObjectCopy.DragTarget,TargetPos.X,TargetPos.Y); ADockObjectCopy.EndDrag(ADockObjectCopy.DragTarget,TargetPos.X,TargetPos.Y);

2
lcl/include/wincontrol.inc
View File

@ -7587,7 +7587,7 @@ begin
end; end;
function TWinControl.DoDockClientMsg(DragDockObject: TDragDockObject; function TWinControl.DoDockClientMsg(DragDockObject: TDragDockObject;
Position: TPoint): boolean; aPosition: TPoint): boolean;
var var
DestRect: TRect; DestRect: TRect;
Form: TCustomForm; Form: TCustomForm;