|
@@ -3082,18 +3082,26 @@ procedure TDirView.DDChooseEffect(grfKeyState: Integer;
|
|
begin
|
|
begin
|
|
if DragDropFilesEx.OwnerIsSource and
|
|
if DragDropFilesEx.OwnerIsSource and
|
|
(dwEffect = DropEffect_Copy) and (not Assigned(DropTarget)) then
|
|
(dwEffect = DropEffect_Copy) and (not Assigned(DropTarget)) then
|
|
- dwEffect := DropEffect_None
|
|
|
|
|
|
+ begin
|
|
|
|
+ dwEffect := DropEffect_None
|
|
|
|
+ end
|
|
else
|
|
else
|
|
if (grfKeyState and (MK_CONTROL or MK_SHIFT) = 0) then
|
|
if (grfKeyState and (MK_CONTROL or MK_SHIFT) = 0) then
|
|
begin
|
|
begin
|
|
if ExeDrag and (Path[1] >= FirstFixedDrive) and
|
|
if ExeDrag and (Path[1] >= FirstFixedDrive) and
|
|
- (DragDrive >= FirstFixedDrive) then dwEffect := DropEffect_Link
|
|
|
|
|
|
+ (DragDrive >= FirstFixedDrive) then
|
|
|
|
+ begin
|
|
|
|
+ dwEffect := DropEffect_Link
|
|
|
|
+ end
|
|
else
|
|
else
|
|
if DragOnDriveIsMove and
|
|
if DragOnDriveIsMove and
|
|
(not DDOwnerIsSource or Assigned(DropTarget)) and
|
|
(not DDOwnerIsSource or Assigned(DropTarget)) and
|
|
(((DragDrive = Upcase(Path[1])) and (dwEffect = DropEffect_Copy) and
|
|
(((DragDrive = Upcase(Path[1])) and (dwEffect = DropEffect_Copy) and
|
|
(DragDropFilesEx.AvailableDropEffects and DropEffect_Move <> 0))
|
|
(DragDropFilesEx.AvailableDropEffects and DropEffect_Move <> 0))
|
|
- or IsRecycleBin) then dwEffect := DropEffect_Move;
|
|
|
|
|
|
+ or IsRecycleBin) then
|
|
|
|
+ begin
|
|
|
|
+ dwEffect := DropEffect_Move;
|
|
|
|
+ end;
|
|
end;
|
|
end;
|
|
|
|
|
|
inherited;
|
|
inherited;
|