paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-10-01 09:29:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: Fix scrolling to correct pos after undo. issue #0018228

Browse Source 
git-svn-id: trunk@28738 -
This commit is contained in:
martin 2010-12-17 03:48:27 +00:00
parent 3393fc6278
commit 801686ce3e
1 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
components/synedit/synedit.pp
View File

@ -544,7 +544,9 @@ type
procedure SetBlockEnd(Value: TPoint); procedure SetBlockEnd(Value: TPoint);
procedure SetBlockIndent(const AValue: integer); procedure SetBlockIndent(const AValue: integer);
procedure SetCaretAndSelection(const ptCaret, ptBefore, ptAfter: TPoint; procedure SetCaretAndSelection(const ptCaret, ptBefore, ptAfter: TPoint;
Mode: TSynSelectionMode = smCurrent); Mode: TSynSelectionMode = smCurrent;
MakeSelectionVisible: Boolean = False
);
procedure SetCaretX(const Value: Integer); procedure SetCaretX(const Value: Integer);
procedure SetCaretY(const Value: Integer); procedure SetCaretY(const Value: Integer);
procedure SetExtraLineSpacing(const Value: integer); procedure SetExtraLineSpacing(const Value: integer);
@ -1274,7 +1276,7 @@ begin
Result := Caller is TSynEdit; Result := Caller is TSynEdit;
if Result then if Result then
with TSynEdit(Caller) do begin with TSynEdit(Caller) do begin
SetCaretAndSelection(FCaretPos, FBeginPos, FEndPos, FBlockMode); SetCaretAndSelection(FCaretPos, FBeginPos, FEndPos, FBlockMode, True);
FTheLinesView.CurUndoList.AddChange(TSynEditUndoSelCaret.Create(FCaretPos, FBeginPos, FTheLinesView.CurUndoList.AddChange(TSynEditUndoSelCaret.Create(FCaretPos, FBeginPos,
FEndPos, FBlockMode)); FEndPos, FBlockMode));
end; end;
@ -7517,17 +7519,61 @@ begin
end; end;
procedure TCustomSynEdit.SetCaretAndSelection(const ptCaret, ptBefore, procedure TCustomSynEdit.SetCaretAndSelection(const ptCaret, ptBefore,
ptAfter: TPoint; Mode: TSynSelectionMode = smCurrent); ptAfter: TPoint; Mode: TSynSelectionMode = smCurrent; MakeSelectionVisible: Boolean = False);
// caret is physical (screen) // caret is physical (screen)
// Before, After is logical (byte) // Before, After is logical (byte)
var
L1, L2, LBottomLine, LCaretFirst, LCaretLast: Integer;
begin begin
DoIncPaintLock(Self); // No editing is taking place DoIncPaintLock(Self); // No editing is taking place
CaretXY := ptCaret; CaretXY := ptCaret;
SetBlockBegin(ptBefore); SetBlockBegin(ptBefore);
SetBlockEnd(ptAfter); SetBlockEnd(ptAfter);
if Mode <> smCurrent then if Mode <> smCurrent then
FBlockSelection.ActiveSelectionMode := Mode; FBlockSelection.ActiveSelectionMode := Mode;
AquirePrimarySelection; AquirePrimarySelection;
if MakeSelectionVisible then begin
//l1 := FBlockSelection.FirstLineBytePos;;
LBottomLine := FFoldedLinesView.TextPosAddLines(TopLine, LinesInWindow);
LCaretFirst := CaretY;
LCaretLast := Max(1, FFoldedLinesView.TextPosAddLines(CaretY, 1-LinesInWindow)); // Will have caret on last visible line
l1 := Min(LCaretFirst, FBlockSelection.FirstLineBytePos.y);
l2 := Max(LCaretFirst, FBlockSelection.LastLineBytePos.y);
if CaretY < TopLine then begin
// Scrolling up, Topline = L1 ; but ensure Caret
TopLine := Max(LCaretLast,
Min(LCaretFirst,
L1
));
end
else if CaretY > LBottomLine then begin
// Scrolling down, LastLine = L2
TopLine := Max(LCaretLast,
Min(LCaretFirst,
FFoldedLinesView.TextPosAddLines(L2, 1-LinesInWindow)
));
end
else begin
// Caret alreayd visible, check block
if l1 < TopLine then
TopLine := Max(LCaretLast,
Min(LCaretFirst,
L1
))
else
if l2 > LBottomLine then
TopLine := Max(LCaretLast,
Min(LCaretFirst,
FFoldedLinesView.TextPosAddLines(L2, 1-LinesInWindow)
));
end;
end;
DoDecPaintLock(Self); DoDecPaintLock(Self);
end; end;