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

SynEdit: fix MarksGutter deduplication

Browse Source
This commit is contained in:
Martin 2024-04-21 22:48:11 +02:00
parent 73cb3d87f4
commit fca464e951
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/synedit/synguttermarks.pp
View File

@ -191,14 +191,23 @@ begin
if (FOptions * [sgmoDeDuplicateMarks, sgmoDeDuplicateMarksKeepTwo] <> []) or if (FOptions * [sgmoDeDuplicateMarks, sgmoDeDuplicateMarksKeepTwo] <> []) or
((sgmoDeDuplicateMarksOnOverflow in FOptions) and (vcnt > ColumnCount)) ((sgmoDeDuplicateMarksOnOverflow in FOptions) and (vcnt > ColumnCount))
then begin then begin
VCntU := 1; VCntU := 0;
VCnt2 := 0; VCnt2 := 0;
for j := 1 to MLine.Count - 1 do prev_iidx := low(integer);
if MLine[j].ImageIndex <> MLine[j-1].ImageIndex then pprev_iidx := low(integer);
for j := 0 to MLine.Count - 1 do begin
if (not MLine[j].Visible) or
(MLine[j].IsBookmark and (not FBookMarkOpt.GlyphsVisible))
then
continue;
if MLine[j].ImageIndex <> prev_iidx then
inc(VCntU) // Uniq inc(VCntU) // Uniq
else else
if (j=1) or (MLine[j].ImageIndex <> MLine[j-2].ImageIndex) then if (j=1) or (MLine[j].ImageIndex <> pprev_iidx) then
inc(VCnt2); // sgmoDeDuplicateMarksKeepTwo inc(VCnt2); // sgmoDeDuplicateMarksKeepTwo
pprev_iidx := prev_iidx;
prev_iidx := MLine[j].ImageIndex;
end;
if (sgmoDeDuplicateMarks in FOptions) then begin if (sgmoDeDuplicateMarks in FOptions) then begin
vcnt := Min(vcntU, ColumnCount + MaxExtraMarksColums); vcnt := Min(vcntU, ColumnCount + MaxExtraMarksColums);