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

SynEdit: Markup, fixes to temp-enable

Browse Source 
git-svn-id: trunk@53988 -
This commit is contained in:
martin 2017-01-24 01:43:56 +00:00
parent b32479366d
commit 41861e5d2c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/synedit/syneditmarkup.pp
View File

@ -198,7 +198,7 @@ end;
function TSynEditMarkup.GetEnabled: Boolean; function TSynEditMarkup.GetEnabled: Boolean;
begin begin
Result := FEnabled and (FTempEnable = 0); Result := (FTempEnable = 0);
end; end;
function TSynEditMarkup.GetFGColor : TColor; function TSynEditMarkup.GetFGColor : TColor;
@ -466,7 +466,7 @@ end;
function TSynEditMarkup.RealEnabled: Boolean; function TSynEditMarkup.RealEnabled: Boolean;
begin begin
Result := Enabled and MarkupInfo.IsEnabled; Result := (FTempEnable = 0) and Enabled and MarkupInfo.IsEnabled;
end; end;
procedure TSynEditMarkup.PrepareMarkupForRow(aRow: Integer); procedure TSynEditMarkup.PrepareMarkupForRow(aRow: Integer);

2
components/synedit/syneditmarkupifdef.pp
View File

@ -779,7 +779,7 @@ end;
function TSynEditMarkupIfDefBase.RealEnabled: Boolean; function TSynEditMarkupIfDefBase.RealEnabled: Boolean;
begin begin
Result := Enabled and HasEnabledMarkup; Result := inherited and HasEnabledMarkup;
end; end;
{ TSynRefCountedDictIfDef } { TSynRefCountedDictIfDef }

2
components/synedit/syneditmarkupspecialline.pp
View File

@ -130,7 +130,7 @@ end;
function TSynEditMarkupSpecialLine.RealEnabled: Boolean; function TSynEditMarkupSpecialLine.RealEnabled: Boolean;
begin begin
Result := Enabled and Result := inherited and
(Assigned(FOnSpecialLineMarkup) or Assigned(FOnSpecialLineColors) or (Assigned(FOnSpecialLineMarkup) or Assigned(FOnSpecialLineColors) or
HasLineHighlight HasLineHighlight
); );