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

SynEdit: OverviewGutter, show enabled/disabled breakpoint and exec line in diff colors

Browse Source 
git-svn-id: trunk@40218 -
This commit is contained in:
martin 2013-02-09 01:42:27 +00:00
parent f84eee2a4b
commit efbdf1e72b
2 changed files with 74 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/synedit/syngutterlineoverview.pp
View File

@ -1130,6 +1130,8 @@ procedure TSynGutterLOvProviderBookmarks.DoMarkChange(Sender: TSynEditMark;
Changes: TSynEditMarkChangeReasons);
var
i: Integer;
c: TColor;
p: Integer;
begin
if (smcrAdded in Changes) or
( (smcrVisible in Changes) and Sender.Visible )
@ -1161,7 +1163,16 @@ begin
end
else
begin
//i := IndexOfSynMark(Sender);
i := IndexOfSynMark(Sender);
if i >= 0 then begin
c := Color;
p := Priority;
AdjustColorForMark(Sender, c, p);
FMarkList[i].FPriority := p;
FMarkList[i].FColor := c;
FMarkList[i].DoChange;
end;
InvalidateTextLines(0, TextBuffer.Count); // Todo
end
end;

70
ide/sourcesyneditor.pas
View File

@ -47,13 +47,12 @@ uses
LazSynIMM,
{$ENDIF}
Classes, SysUtils, Controls, LCLProc, LCLType, Graphics, Menus, math, LazarusIDEStrConsts,
SynEdit, SynEditMiscClasses, SynGutter, SynGutterBase, SynEditMarks, SynEditTypes,
SynGutterLineNumber, SynGutterCodeFolding, SynGutterMarks, SynGutterChanges,
SynEdit, SynEditMiscClasses, SynGutter, SynGutterBase, SynEditMarks,
SynEditTypes, SynGutterLineNumber, SynGutterCodeFolding, SynGutterMarks, SynGutterChanges,
SynGutterLineOverview, SynEditMarkup, SynEditMarkupGutterMark, SynEditMarkupSpecialLine,
SynEditTextBuffer, SynEditFoldedView, SynTextDrawer, SynEditTextBase, LazSynEditText,
SynPluginTemplateEdit, SynPluginSyncroEdit, LazSynTextArea, SynEditHighlighter,
SynEditHighlighterFoldBase, SynHighlighterPas, SynEditMouseCmds, SynEditMarkupHighAll,
SynEditKeyCmds;
SynEditHighlighterFoldBase, SynHighlighterPas, SynEditMarkupHighAll, SynEditKeyCmds;
type
@ -321,14 +320,22 @@ type
// Bookmarsk and breakpoints
private
FBreakColor: TColor;
FBreakDisabledColor: TColor;
FExecLineColor: TColor;
FRGBBreakColor: TColorRef;
FRGBBreakDisabledColor: TColor;
FRGBExecLineColor: TColor;
procedure SetBreakColor(const AValue: TColor);
procedure SetBreakDisabledColor(AValue: TColor);
procedure SetExecLineColor(AValue: TColor);
protected
procedure AdjustColorForMark(AMark: TSynEditMark; var AColor: TColor; var APriority: Integer); override;
public
constructor Create(AOwner: TComponent); override;
published
property BreakColor: TColor read FBreakColor write SetBreakColor;
property BreakDisabledColor: TColor read FBreakDisabledColor write SetBreakDisabledColor;
property ExecLineColor: TColor read FExecLineColor write SetExecLineColor;
end;
{ TIDESynGutter }
@ -417,6 +424,8 @@ type
implementation
uses SourceMarks;
{ TSourceSynSearchTermDict }
function TSourceSynSearchTermDict.GetTerms: TSourceSynSearchTermList;
@ -1886,20 +1895,65 @@ begin
DoChange(Self);
end;
procedure TIDESynGutterLOvProviderIDEMarks.SetBreakDisabledColor(AValue: TColor);
begin
if FBreakDisabledColor = AValue then Exit;
FBreakDisabledColor := AValue;
FRGBBreakDisabledColor := ColorToRGB(AValue);
DoChange(Self);
end;
procedure TIDESynGutterLOvProviderIDEMarks.SetExecLineColor(AValue: TColor);
begin
if FExecLineColor = AValue then Exit;
FExecLineColor := AValue;
FRGBExecLineColor := ColorToRGB(AValue);
DoChange(Self);
end;
procedure TIDESynGutterLOvProviderIDEMarks.AdjustColorForMark(AMark: TSynEditMark;
var AColor: TColor; var APriority: Integer);
var
i: Integer;
begin
inc(APriority, 1);
if not AMark.IsBookmark then begin
AColor := TColor(FRGBBreakColor);
inc(APriority);
end;
//if (AMark.ImageList = SourceEditorMarks.ImgList) then begin
i := AMark.ImageIndex;
if (i = SourceEditorMarks.CurrentLineImg) or
(i = SourceEditorMarks.CurrentLineBreakPointImg) or
(i = SourceEditorMarks.CurrentLineDisabledBreakPointImg)
then begin
dec(APriority, 1);
AColor := TColor(FRGBExecLineColor);
end
else
if (i = SourceEditorMarks.InactiveBreakPointImg) or
(i = SourceEditorMarks.InvalidDisabledBreakPointImg) or
(i = SourceEditorMarks.UnknownDisabledBreakPointImg)
then begin
inc(APriority, 2);
AColor := TColor(FRGBBreakDisabledColor);
end
else begin
AColor := TColor(FRGBBreakColor);
inc(APriority, 1);
end;
end;
// else begin
// AColor := TColor(FRGBBreakColor);
// inc(APriority);
// end;
//end;
inherited AdjustColorForMark(AMark, AColor, APriority);
end;
constructor TIDESynGutterLOvProviderIDEMarks.Create(AOwner: TComponent);
begin
inherited Create(AOwner);
BreakColor := $0080C8;
BreakColor := $0080C8;
BreakDisabledColor := $00D000;
ExecLineColor := $F000D0;
end;
{ TIDESynGutter }