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

SynEdit: improved scroll speed with certain highlights active

Browse Source 
git-svn-id: trunk@28369 -
This commit is contained in:
martin 2010-11-20 13:23:55 +00:00
parent b1578e5dac
commit 02a520c0c1
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/synedit/synedit.pp
View File

@ -400,6 +400,7 @@ type
fTextOffset: Integer;
fTopLine: Integer;
FOldTopLine, FOldTopView: Integer;
FLastTextChangeStamp: Int64;
fHighlighter: TSynCustomHighlighter;
fUndoList: TSynEditUndoList;
fRedoList: TSynEditUndoList;
@ -535,7 +536,7 @@ type
procedure MoveCaretVert(DY: integer);
procedure PrimarySelectionRequest(const RequestedFormatID: TClipboardFormat;
Data: TStream);
procedure ScanRanges;
procedure ScanRanges(ATextChanged: Boolean = True);
procedure IdleScanRanges(Sender: TObject; var Done: Boolean);
procedure DoBlockSelectionChanged(Sender: TObject);
procedure SetBlockBegin(Value: TPoint);
@ -1886,6 +1887,7 @@ begin
FInvalidateRect := Rect(-1, -1, -2, -2);
FOldTopLine := FTopLine;
FOldTopView := TopView;
FLastTextChangeStamp := TSynEditStringList(FLines).TextChangeStamp;
end;
inc(FPaintLock);
FMarkupManager.IncPaintLock;
@ -1901,7 +1903,7 @@ begin
FIsInDecPaintLock := True;
try
if (FPaintLock=1) and HandleAllocated then begin
ScanRanges;
ScanRanges(FLastTextChangeStamp <> TSynEditStringList(FLines).TextChangeStamp);
if sfAfterLoadFromFileNeeded in fStateFlags then
AfterLoadFromFile;
if FChangedLinesStart > 0 then begin
@ -4744,7 +4746,7 @@ begin
end;
end;
procedure TCustomSynEdit.ScanRanges;
procedure TCustomSynEdit.ScanRanges(ATextChanged: Boolean = True);
begin
if not HandleAllocated then begin
Application.RemoveOnIdleHandler(@IdleScanRanges); // avoid duplicate add
@ -4753,7 +4755,8 @@ begin
exit;
end;
if not assigned(FHighlighter) then begin
fMarkupManager.TextChanged(FChangedLinesStart, FChangedLinesEnd);
if ATextChanged then
fMarkupManager.TextChanged(FChangedLinesStart, FChangedLinesEnd);
Topline := TopLine;
exit;
end;
@ -4761,7 +4764,8 @@ begin
FHighlighter.ScanRanges;
// Todo: text may not have changed
fMarkupManager.TextChanged(FChangedLinesStart, FChangedLinesEnd);
if ATextChanged then
fMarkupManager.TextChanged(FChangedLinesStart, FChangedLinesEnd);
Topline := TopLine;
end;

31
components/synedit/syneditmarkuphighall.pp
View File

@ -105,7 +105,7 @@ type
Procedure FindStartPoint;
Procedure FindInitialize(Backward: Boolean);
function GetMatchCount: Integer;
Procedure ValidateMatches;
Procedure ValidateMatches(RePaint: Boolean = True; KeepStartPoint: Boolean = False);
procedure SetSearchOptions(const AValue : TSynSearchOptions);
protected
procedure SetSearchString(const AValue : String); virtual;
@ -122,7 +122,7 @@ type
Function GetMarkupAttributeAtRowCol(const aRow, aCol : Integer) : TSynSelectedColor; override;
Function GetNextMarkupColAfterRowCol(const aRow, aCol : Integer) : Integer; override;
Procedure Invalidate;
Procedure Invalidate(RePaint: Boolean = True);
Procedure SendLineInvalidation;
property SearchString : String read fSearchString write SetSearchString;
@ -312,6 +312,7 @@ end;
constructor TSynEditMarkupHighlightAll.Create(ASynEdit : TSynEditBase);
begin
inherited Create(ASynEdit);
fStartPoint.y := -1;
fSearch := TSynEditSearch.Create;
fMatches := TSynMarkupHighAllMatchList.Create;
fSearchString:='';
@ -344,17 +345,16 @@ end;
procedure TSynEditMarkupHighlightAll.DoTopLineChanged(OldTopLine : Integer);
begin
// {TODO: XXX}
// Need indication if Bitmap was scrooled => Scrolled part does not need invalidateLines
Invalidate;
ValidateMatches;
// {TODO: Only do a partial search on the new area}
Invalidate(False);
ValidateMatches(False, (fStartPoint.y < TopLine) and (fStartPoint.y >= 0));
end;
procedure TSynEditMarkupHighlightAll.DoLinesInWindoChanged(OldLinesInWindow : Integer);
begin
// {TODO: XXX}
Invalidate;
ValidateMatches;
// {TODO: Only do a partial search on the new area}
Invalidate(False);;
ValidateMatches(False, True);
end;
procedure TSynEditMarkupHighlightAll.DoMarkupChanged(AMarkup : TSynSelectedColor);
@ -393,7 +393,8 @@ begin
else fStartPoint := ptEnd;
end;
procedure TSynEditMarkupHighlightAll.ValidateMatches;
procedure TSynEditMarkupHighlightAll.ValidateMatches(RePaint: Boolean = True;
KeepStartPoint: Boolean = False);
var
LastLine : Integer;
Pos : Integer;
@ -411,7 +412,8 @@ begin
LastLine := ScreenRowToRow(LinesInWindow);
{ TODO: need a list of invalidated lines, so we can keep valid matches }
FindStartPoint;
if not KeepStartPoint then
FindStartPoint;
ptStart := fStartPoint;
Pos := 0;
@ -434,7 +436,7 @@ begin
fMatches.Count := Pos;
fMatches.MaybeReduceCapacity;
if not(HideSingleMatch) or (fMatches.Count > 1) then
if RePaint and ( not(HideSingleMatch) or (fMatches.Count > 1) ) then
SendLineInvalidation;
end;
@ -445,9 +447,10 @@ begin
ValidateMatches;
end;
procedure TSynEditMarkupHighlightAll.Invalidate;
procedure TSynEditMarkupHighlightAll.Invalidate(RePaint: Boolean = True);
begin
SendLineInvalidation;
if RePaint then
SendLineInvalidation;
fHasInvalidLines := True;
fMatches.Count := 0;
if SearchString = '' then fMatches.MaybeReduceCapacity;