paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-27 20:53:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: Drag-Selection copy/move - Allow copy to immediately next to source-selection Issue #0037432 - Also set DragCursor to indicate acceptance of drop.

Browse Source 
git-svn-id: trunk@63756 -
This commit is contained in:
martin 2020-08-16 15:40:51 +00:00
parent e773812f85
commit e7835738c3
1 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
components/synedit/synedit.pp
View File

@ -921,6 +921,7 @@ type
function DoHandleMouseAction(AnActionList: TSynEditMouseActions;
var AnInfo: TSynEditMouseActionInfo): Boolean;
procedure DoHandleMouseActionResult(AnActionResult: TSynEditMouseActionResult);
function CheckDragDropAccecpt(ANewCaret: TPoint; ASource: TObject; out ADropMove: boolean): boolean;
protected
procedure SetHighlighter(const Value: TSynCustomHighlighter); virtual;
@ -6398,32 +6399,51 @@ begin
TextBetweenPointsEx[FCaret.LineBytePos, FCaret.LineBytePos, aCaretMode] := aText;
end;
function TCustomSynEdit.CheckDragDropAccecpt(ANewCaret: TPoint; ASource: TObject; out ADropMove: boolean): boolean;
begin
// if from other control then move when SHIFT, else copy
// if from Self then copy when CTRL, else move
if ASource <> Self then begin
ADropMove := GetKeyState(VK_SHIFT) < 0;
Result := TRUE;
end else begin
ADropMove := GetKeyState(VK_CONTROL) >= 0;
Result := not IsPointInSelection(ANewCaret, not ADropMove);
end;
end;
procedure TCustomSynEdit.DragOver(Source: TObject; X, Y: Integer;
State: TDragState; var Accept: Boolean);
var
DropMove: boolean;
begin
inherited;
LastMouseCaret:=Point(-1,-1);
if (Source is TCustomSynEdit) and not TCustomSynEdit(Source).ReadOnly then
Accept := False;
if (not ReadOnly) and (Source is TCustomSynEdit) and TCustomSynEdit(Source).SelAvail then
begin
Accept := True;
//Ctrl is pressed => change cursor to indicate copy instead of move
if GetKeyState(VK_CONTROL) < 0 then
DragCursor := crMultiDrag
else
DragCursor := crDrag;
FBlockSelection.IncPersistentLock;
if State = dsDragLeave then //restore prev caret position
ComputeCaret(FMouseDownX, FMouseDownY)
else //position caret under the mouse cursor
try
//if State = dsDragLeave then //restore prev caret position
// ComputeCaret(FMouseDownX, FMouseDownY)
//else //position caret under the mouse cursor
ComputeCaret(X, Y);
FBlockSelection.DecPersistentLock;
Accept := CheckDragDropAccecpt(LogicalCaretXY, Source, DropMove);
if DropMove then
DragCursor := crDrag
else
DragCursor := crMultiDrag;
finally
FBlockSelection.DecPersistentLock;
end;
end;
end;
procedure TCustomSynEdit.DragDrop(Source: TObject; X, Y: Integer);
var
NewCaret: TPoint;
DoDrop, DropAfter, DropMove: boolean;
DropAfter, DropMove: boolean;
BB, BE: TPoint;
DragDropText: string;
Adjust: integer;
@ -6438,22 +6458,11 @@ begin
inherited;
ComputeCaret(X, Y);
NewCaret := LogicalCaretXY;
// if from other control then move when SHIFT, else copy
// if from Self then copy when CTRL, else move
if Source <> Self then begin
DropMove := GetKeyState(VK_SHIFT) < 0;
DoDrop := TRUE;
DropAfter := FALSE;
end else begin
DropMove := GetKeyState(VK_CONTROL) >= 0;
if CheckDragDropAccecpt(NewCaret, Source, DropMove) then begin
BB := BlockBegin;
BE := BlockEnd;
DropAfter := (NewCaret.Y > BE.Y)
or ((NewCaret.Y = BE.Y) and (NewCaret.X > BE.X));
DoDrop := DropAfter or (NewCaret.Y < BB.Y)
or ((NewCaret.Y = BB.Y) and (NewCaret.X < BB.X));
end;
if DoDrop then begin
or ((NewCaret.Y = BE.Y) and (NewCaret.X >= BE.X));
InternalBeginUndoBlock; //mh 2000-11-20
try
DragDropText := TCustomSynEdit(Source).SelText;