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

SynEdit, highlight word-brackets (begin/end): Fixed, invalidate, if highlight changed

Browse Source 
git-svn-id: trunk@27709 -
This commit is contained in:
martin 2010-10-14 22:45:40 +00:00
parent 02790b2ed8
commit 276625f65d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/synedit/syneditmarkupwordgroup.pp
View File

@ -46,6 +46,7 @@ type
FHighlightPos3: TWordPoint; FHighlightPos3: TWordPoint;
FHighlighter: TSynCustomHighlighter; FHighlighter: TSynCustomHighlighter;
FNeedInvalidate: Boolean; FNeedInvalidate: Boolean;
FForceInvalidate: Boolean;
procedure SetHighlighter(const AValue: TSynCustomHighlighter); procedure SetHighlighter(const AValue: TSynCustomHighlighter);
protected protected
procedure FindMatchingWords(PhysCaret: TPoint; procedure FindMatchingWords(PhysCaret: TPoint;
@ -308,6 +309,7 @@ end;
procedure TSynEditMarkupWordGroup.DoMarkupChanged(AMarkup: TSynSelectedColor); procedure TSynEditMarkupWordGroup.DoMarkupChanged(AMarkup: TSynSelectedColor);
begin begin
FForceInvalidate := True;
InvalidateCurrentHighlight; InvalidateCurrentHighlight;
end; end;
@ -324,20 +326,22 @@ begin
// invalidate old highlighting, if changed // invalidate old highlighting, if changed
if (FHighlightPos1.Y > 0) if (FHighlightPos1.Y > 0)
and (CompareWordPoints(FHighlightPos1, NewPos) <> 0) and ((CompareWordPoints(FHighlightPos1, NewPos) <> 0) or FForceInvalidate)
then then
InvalidateSynLines(FHighlightPos1.Y,FHighlightPos1.Y); InvalidateSynLines(FHighlightPos1.Y,FHighlightPos1.Y);
if (FHighlightPos2.Y > 0) if (FHighlightPos2.Y > 0)
and (CompareWordPoints(FHighlightPos2, NewAntiPos) <> 0) and ((CompareWordPoints(FHighlightPos2, NewAntiPos) <> 0) or FForceInvalidate)
then then
InvalidateSynLines(FHighlightPos2.Y,FHighlightPos2.Y); InvalidateSynLines(FHighlightPos2.Y,FHighlightPos2.Y);
if (FHighlightPos3.Y > 0) if (FHighlightPos3.Y > 0)
and (CompareWordPoints(FHighlightPos3, NewMiddlePos) <> 0) and ((CompareWordPoints(FHighlightPos3, NewMiddlePos) <> 0) or FForceInvalidate)
then then
InvalidateSynLines(FHighlightPos3.Y,FHighlightPos3.Y); InvalidateSynLines(FHighlightPos3.Y,FHighlightPos3.Y);
FForceInvalidate := False;
// invalidate new highlighting, if changed // invalidate new highlighting, if changed
if (NewPos.Y>0) if (NewPos.Y>0)
and (CompareWordPoints(FHighlightPos1, NewPos) <> 0) then and (CompareWordPoints(FHighlightPos1, NewPos) <> 0) then