restore TDragObject.AlwaysShowDragImages

git-svn-id: trunk@13585 -
This commit is contained in:
paul 2008-01-02 17:33:05 +00:00
parent 503fec0d8a
commit 60e3581489
2 changed files with 13 additions and 6 deletions

View File

@ -330,6 +330,7 @@ type
TDragObject = class
private
FAlwaysShowDragImages: Boolean;
FDragPos: TPoint;
FControl: TControl;
FDragTarget: TControl;
@ -343,6 +344,7 @@ type
procedure HideDragImage; virtual;
procedure ShowDragImage; virtual;
property AlwaysShowDragImages: Boolean read FAlwaysShowDragImages write FAlwaysShowDragImages;
property Control: TControl read FControl write FControl;
property DragPos: TPoint read FDragPos write FDragPos;
property DragTarget: TControl read FDragTarget write FDragTarget;

View File

@ -197,13 +197,17 @@ begin
DragCursor := FDragObject.GetDragCursor(SendCmDragMsg(FDragObject, dmDragMove),APosition.X, APosition.Y);
if FDragImageList <> nil then
begin
if(ATarget = nil)or(csDisplayDragImage in ATarget.ControlStyle) then begin
if (ATarget = nil) or (csDisplayDragImage in ATarget.ControlStyle) or
FDragObject.AlwaysShowDragImages then
begin
FDragImageList.DragCursor := DragCursor;
if not FDragImageList.Dragging
then FDragImageList.BeginDrag(0, APosition.X, APosition.Y)
else FDragImageList.DragMove(APosition.X, APosition.Y);
if not FDragImageList.Dragging then
FDragImageList.BeginDrag(0, APosition.X, APosition.Y)
else
FDragImageList.DragMove(APosition.X, APosition.Y);
end
else FDragImageList.EndDrag;
else
FDragImageList.EndDrag;
end;
WidgetSet.SetCursor(Screen.Cursors[DragCursor]);
end;
@ -431,7 +435,8 @@ begin
DragCursor := FDockObject.GetDragCursor(SendCmDragMsg(FDockObject, dmDragMove),APosition.X, APosition.Y);
if FDragImageList <> nil then
begin
if(ATarget = nil) or (csDisplayDragImage in ATarget.ControlStyle) then
if (ATarget = nil) or (csDisplayDragImage in ATarget.ControlStyle) or
FDockObject.AlwaysShowDragImages then
begin
FDragImageList.DragCursor := DragCursor;
if not FDragImageList.Dragging then