paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-18 03:59:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

SynEdit: marks use logical x pos

Browse Source 
git-svn-id: trunk@27891 -
This commit is contained in:
martin 2010-10-26 22:53:02 +00:00
parent ab1847a0fb
commit a0bf2b0be8
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/synedit/synedit.pp
View File

@ -5479,16 +5479,14 @@ end;
procedure TCustomSynEdit.GotoBookMark(BookMark: Integer);
var
NewCaret: TPoint;
LogCaret: TPoint;
begin
if (BookMark in [0..9]) and assigned(fBookMarks[BookMark])
and (fBookMarks[BookMark].Line <= fLines.Count)
then begin
NewCaret:=Point(fBookMarks[BookMark].Column, fBookMarks[BookMark].Line);
LogCaret:=PhysicalToLogicalPos(NewCaret);
LogCaret:=Point(fBookMarks[BookMark].Column, fBookMarks[BookMark].Line);
DoIncPaintLock(Self); // No editing is taking place
FCaret.LineCharPos := NewCaret;
FCaret.LineBytePos := LogCaret;
SetBlockEnd(LogCaret);
SetBlockBegin(LogCaret);
DoDecPaintLock(Self);
@ -5510,6 +5508,7 @@ begin
if (BookMark in [0..9]) and (Y >= 1) and (Y <= Max(1, fLines.Count)) then
begin
mark := TSynEditMark.Create(self);
X := PhysicalToLogicalPos(Point(X, Y)).x;
with mark do begin
Line := Y;
Column := X;
@ -6812,6 +6811,7 @@ begin
if Marks[i].IsBookmark and (Marks[i].BookmarkNumber = BookMark) then begin
X := Marks[i].Column;
Y := Marks[i].Line;
X := LogicalToPhysicalPos(Point(X, Y)).x;
Result := true;
Exit;
end;

19
components/synedit/syneditmarks.pp
View File

@ -90,7 +90,7 @@ type
property OldLine: integer read FOldLine; // not used, if synedit insert/delete lines
property Line: integer read GetLine write SetLine;
property Column: integer read FColumn write SetColumn;
property Column: integer read FColumn write SetColumn; // Logical position
property Priority: integer read FPriority write SetPriority;
property Visible: boolean read FVisible write SetVisible;
@ -1117,7 +1117,7 @@ end;
procedure TSynEditMarkList.DoLinesEdited(Sender: TSynEditStrings; aLinePos, aBytePos, aCount,
aLineBrkCnt: Integer; aText: String);
var
i, Col: Integer;
i: Integer;
CurLine: TSynEditMarkLine;
LinePos, LineBSize: Integer;
f: Boolean;
@ -1128,7 +1128,6 @@ begin
exit;
LinePos := CurLine.LineNum;
Col := FLines.LogicalToPhysicalPos(Point(aBytePos, aLinePos)).x;
FInternalIterator.Invalidate; // TODO: better notification system
if aLineBrkCnt > 0 then begin
@ -1138,9 +1137,9 @@ begin
i := CurLine.Count - 1;
while i >= 0 do begin
Mrk := CurLine.Items[i];
if (Mrk.Column > col) then begin
if (Mrk.Column > aBytePos) then begin
Mrk.Line := Mrk.Line + aLineBrkCnt;
Mrk.Column := Mrk.Column - Col + 1;
Mrk.Column := Mrk.Column - aBytePos + 1;
end;
dec(i);
end;
@ -1158,9 +1157,9 @@ begin
Mrk := CurLine.Items[i];
Mrk.Line := aLinePos;
if f then
Mrk.Column := Mrk.Column + Col - 1
Mrk.Column := Mrk.Column + aBytePos - 1
else
Mrk.Column := Col; // or delete ?
Mrk.Column := aBytePos; // or delete ?
dec(i);
end;
CurLine := TSynEditMarkLine(CurLine.Successor(LinePos, LineBSize));
@ -1173,13 +1172,13 @@ begin
if aLinePos = LinePos then begin
if aCount > 0 then begin
for i := 0 to CurLine.Count - 1 do
if (CurLine.Items[i].Column > col) then
if (CurLine.Items[i].Column > aBytePos) then
CurLine.Items[i].Column := CurLine.Items[i].Column + aCount
end
else if aCount < 0 then begin
for i := 0 to CurLine.Count - 1 do
if (CurLine.Items[i].Column > col) then
CurLine.Items[i].Column := Max(Col, CurLine.Items[i].Column + aCount);
if (CurLine.Items[i].Column > aBytePos) then
CurLine.Items[i].Column := Max(aBytePos, CurLine.Items[i].Column + aCount);
end;
end;