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

SynEdit, Markup-word: Fixed slow reaction to deselected block

Browse Source 
git-svn-id: trunk@18218 -
This commit is contained in:
martin 2009-01-08 23:37:46 +00:00
parent 1fbe62ce7f
commit a38e378eb6
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/synedit/synedit.pp
View File

@ -1470,6 +1470,7 @@ begin
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
// needed before setting color // needed before setting color
fMarkupHighCaret := TSynEditMarkupHighlightAllCaret.Create(self); fMarkupHighCaret := TSynEditMarkupHighlightAllCaret.Create(self);
fMarkupHighCaret.Selection := FBlockSelection;
fMarkupHighAll := TSynEditMarkupHighlightAll.Create(self); fMarkupHighAll := TSynEditMarkupHighlightAll.Create(self);
fMarkupBracket := TSynEditMarkupBracket.Create(self); fMarkupBracket := TSynEditMarkupBracket.Create(self);
fMarkupCtrlMouse := TSynEditMarkupCtrlMouseLink.Create(self); fMarkupCtrlMouse := TSynEditMarkupCtrlMouseLink.Create(self);

26
components/synedit/syneditmarkuphighall.pp
View File

@ -27,7 +27,7 @@ interface
uses uses
Classes, SysUtils, ExtCtrls, SynEditMarkup, SynEditTypes, SynEditSearch, Classes, SysUtils, ExtCtrls, SynEditMarkup, SynEditTypes, SynEditSearch,
SynEditMiscClasses, Controls, LCLProc, SynEditHighlighter; SynEditMiscClasses, Controls, LCLProc, SynEditHighlighter, SynEditPointClasses;
type type
@ -135,13 +135,16 @@ type
FFullWord: Boolean; FFullWord: Boolean;
FFullWordMaxLen: Integer; FFullWordMaxLen: Integer;
FIgnoreKeywords: Boolean; FIgnoreKeywords: Boolean;
FSelection: TSynEditSelection;
FHighlighter: TSynCustomHighlighter; FHighlighter: TSynCustomHighlighter;
procedure SetFullWord(const AValue: Boolean); procedure SetFullWord(const AValue: Boolean);
procedure SetFullWordMaxLen(const AValue: Integer); procedure SetFullWordMaxLen(const AValue: Integer);
procedure SetHighlighter(const AValue: TSynCustomHighlighter); procedure SetHighlighter(const AValue: TSynCustomHighlighter);
procedure SetIgnoreKeywords(const AValue: Boolean); procedure SetIgnoreKeywords(const AValue: Boolean);
procedure SetSelection(const AValue: TSynEditSelection);
procedure SetWaitTime(const AValue: Integer); procedure SetWaitTime(const AValue: Integer);
protected protected
procedure SelectionChanged(Sender: TObject);
procedure DoCaretChanged(OldCaret : TPoint); override; procedure DoCaretChanged(OldCaret : TPoint); override;
procedure DoTextChanged(StartLine, EndLine : Integer); override; procedure DoTextChanged(StartLine, EndLine : Integer); override;
procedure DoMarkupChanged(AMarkup: TSynSelectedColor); override; procedure DoMarkupChanged(AMarkup: TSynSelectedColor); override;
@ -158,6 +161,7 @@ type
property IgnoreKeywords: Boolean read FIgnoreKeywords write SetIgnoreKeywords; property IgnoreKeywords: Boolean read FIgnoreKeywords write SetIgnoreKeywords;
property Highlighter: TSynCustomHighlighter property Highlighter: TSynCustomHighlighter
read FHighlighter write SetHighlighter; read FHighlighter write SetHighlighter;
property Selection: TSynEditSelection write SetSelection;
end; end;
implementation implementation
@ -546,6 +550,14 @@ begin
RestartTimer; RestartTimer;
end; end;
procedure TSynEditMarkupHighlightAllCaret.SelectionChanged(Sender: TObject);
begin
if (SearchString = GetCurrentText) and (SearchOptions = GetCurrentOption) then
exit;
SearchString := '';
RestartTimer;
end;
procedure TSynEditMarkupHighlightAllCaret.SetFullWord(const AValue: Boolean); procedure TSynEditMarkupHighlightAllCaret.SetFullWord(const AValue: Boolean);
begin begin
if FFullWord = AValue then exit; if FFullWord = AValue then exit;
@ -574,6 +586,15 @@ begin
ScrollTimerHandler(self); ScrollTimerHandler(self);
end; end;
procedure TSynEditMarkupHighlightAllCaret.SetSelection(const AValue: TSynEditSelection);
begin
if Assigned(FSelection) then
FSelection.RemoveChangeHandler({$IFDEF FPC}@{$ENDIF}SelectionChanged);
FSelection := AValue;
if Assigned(FSelection) then
FSelection.AddChangeHandler({$IFDEF FPC}@{$ENDIF}SelectionChanged);
end;
procedure TSynEditMarkupHighlightAllCaret.DoCaretChanged(OldCaret: TPoint); procedure TSynEditMarkupHighlightAllCaret.DoCaretChanged(OldCaret: TPoint);
begin begin
if (SearchString = GetCurrentText) and (SearchOptions = GetCurrentOption) then if (SearchString = GetCurrentText) and (SearchOptions = GetCurrentOption) then
@ -603,6 +624,7 @@ end;
procedure TSynEditMarkupHighlightAllCaret.ScrollTimerHandler(Sender: TObject); procedure TSynEditMarkupHighlightAllCaret.ScrollTimerHandler(Sender: TObject);
begin begin
FTimer.Enabled := False;
if (SearchString = GetCurrentText) and (SearchOptions = GetCurrentOption) then if (SearchString = GetCurrentText) and (SearchOptions = GetCurrentOption) then
exit; exit;
SearchString := ''; // prevent double update SearchString := ''; // prevent double update
@ -649,6 +671,8 @@ end;
destructor TSynEditMarkupHighlightAllCaret.Destroy; destructor TSynEditMarkupHighlightAllCaret.Destroy;
begin begin
if Assigned(FSelection) then
FSelection.RemoveChangeHandler({$IFDEF FPC}@{$ENDIF}SelectionChanged);
FreeAndNil(FTimer); FreeAndNil(FTimer);
inherited Destroy; inherited Destroy;
end; end;

1
components/synedit/syneditpointclasses.pas
View File

@ -896,6 +896,7 @@ procedure TSynEditSelection.SetSelectionMode(const AValue: TSynSelectionMode);
begin begin
FSelectionMode := AValue; FSelectionMode := AValue;
SetActiveSelectionMode(AValue); SetActiveSelectionMode(AValue);
fOnChangeList.CallNotifyEvents(self);
end; end;
procedure TSynEditSelection.SetActiveSelectionMode(const Value: TSynSelectionMode); procedure TSynEditSelection.SetActiveSelectionMode(const Value: TSynSelectionMode);