editor options, added currentLine attributes

This commit is contained in:
Basile Burg 2015-12-12 11:17:46 +01:00
parent bacac42fb2
commit ce9779d416
2 changed files with 23 additions and 3 deletions

View File

@ -31,6 +31,7 @@ type
// //
fShortCuts: TCollection; fShortCuts: TCollection;
// //
fCurrLineAttribs: TSynSelectedColor;
fSelAttribs: TSynSelectedColor; fSelAttribs: TSynSelectedColor;
fFoldedColor: TSynSelectedColor; fFoldedColor: TSynSelectedColor;
fMouseLinkAttribs: TSynSelectedColor; fMouseLinkAttribs: TSynSelectedColor;
@ -38,6 +39,7 @@ type
fIdentifierMarkup: TSynSelectedColor; fIdentifierMarkup: TSynSelectedColor;
fFont: TFont; fFont: TFont;
// //
fCurrLineColor: TColor;
fDDocDelay: Integer; fDDocDelay: Integer;
fAutoDotDelay: Integer; fAutoDotDelay: Integer;
fTabWidth: Integer; fTabWidth: Integer;
@ -59,7 +61,8 @@ type
procedure setFoldedColor(value: TSynSelectedColor); procedure setFoldedColor(value: TSynSelectedColor);
procedure setMouseLinkColor(value: TSynSelectedColor); procedure setMouseLinkColor(value: TSynSelectedColor);
procedure setBracketMatchColor(value: TSynSelectedColor); procedure setBracketMatchColor(value: TSynSelectedColor);
procedure SetIdentifierMarkup(value: TSynSelectedColor); procedure setIdentifierMarkup(value: TSynSelectedColor);
procedure setCurrLineAttribs(value: TSynSelectedColor);
procedure setD2Syn(value: TPersistent); procedure setD2Syn(value: TPersistent);
procedure setTxtSyn(value: TPersistent); procedure setTxtSyn(value: TPersistent);
procedure setShortcuts(value: TCollection); procedure setShortcuts(value: TCollection);
@ -67,6 +70,7 @@ type
procedure setAutoDotDelay(value: Integer); procedure setAutoDotDelay(value: Integer);
procedure setCompletionMenuLines(value: byte); procedure setCompletionMenuLines(value: byte);
published published
property currentLine: TSynSelectedColor read fCurrLineAttribs write setCurrLineAttribs;
property completionMenuCaseCare: boolean read fCompletionMenuCaseCare write fCompletionMenuCaseCare; property completionMenuCaseCare: boolean read fCompletionMenuCaseCare write fCompletionMenuCaseCare;
property completionMenuWidth: integer read fCompletionMenuWidth write fCompletionMenuWidth; property completionMenuWidth: integer read fCompletionMenuWidth write fCompletionMenuWidth;
property completionMenuLines: byte read fCompletionMenuLines write setCompletionMenuLines; property completionMenuLines: byte read fCompletionMenuLines write setCompletionMenuLines;
@ -162,6 +166,7 @@ begin
// //
fDDocDelay:=200; fDDocDelay:=200;
fAutoDotDelay:=200; fAutoDotDelay:=200;
fCurrLineAttribs := TSynSelectedColor.Create;
fSelAttribs := TSynSelectedColor.Create; fSelAttribs := TSynSelectedColor.Create;
fFoldedColor := TSynSelectedColor.Create; fFoldedColor := TSynSelectedColor.Create;
fMouseLinkAttribs := TSynSelectedColor.Create; fMouseLinkAttribs := TSynSelectedColor.Create;
@ -193,6 +198,9 @@ begin
fBackground := clWhite; fBackground := clWhite;
fRightEdgeColor := clSilver; fRightEdgeColor := clSilver;
// //
fCurrLineAttribs.Background := fBackground - $080808;
fCurrLineAttribs.Foreground := clNone;
//
options1 := options1 :=
[eoAutoIndent, eoBracketHighlight, eoGroupUndo, eoTabsToSpaces, [eoAutoIndent, eoBracketHighlight, eoGroupUndo, eoTabsToSpaces,
eoDragDropEditing, eoShowCtrlMouseLinks, eoEnhanceHomeKey, eoTabIndent]; eoDragDropEditing, eoShowCtrlMouseLinks, eoEnhanceHomeKey, eoTabIndent];
@ -221,6 +229,7 @@ end;
destructor TCEEditorOptionsBase.Destroy; destructor TCEEditorOptionsBase.Destroy;
begin begin
fFont.Free; fFont.Free;
fCurrLineAttribs.Free;
fSelAttribs.Free; fSelAttribs.Free;
fShortCuts.Free; fShortCuts.Free;
fFoldedColor.Free; fFoldedColor.Free;
@ -248,9 +257,11 @@ begin
fFoldedColor.Assign(srcopt.fFoldedColor); fFoldedColor.Assign(srcopt.fFoldedColor);
fMouseLinkAttribs.Assign(srcopt.fMouseLinkAttribs); fMouseLinkAttribs.Assign(srcopt.fMouseLinkAttribs);
fBracketMatchAttribs.Assign(srcopt.fBracketMatchAttribs); fBracketMatchAttribs.Assign(srcopt.fBracketMatchAttribs);
fCurrLineAttribs.Assign(srcopt.fCurrLineAttribs);
fD2Syn.Assign(srcopt.fD2Syn); fD2Syn.Assign(srcopt.fD2Syn);
fTxtSyn.Assign(srcopt.fTxtSyn); fTxtSyn.Assign(srcopt.fTxtSyn);
background := srcopt.background; background := srcopt.background;
tabulationWidth := srcopt.tabulationWidth; tabulationWidth := srcopt.tabulationWidth;
blockIdentation := srcopt.blockIdentation; blockIdentation := srcopt.blockIdentation;
lineSpacing := srcopt.lineSpacing; lineSpacing := srcopt.lineSpacing;
@ -322,6 +333,11 @@ begin
fIdentifierMarkup.Assign(value); fIdentifierMarkup.Assign(value);
end; end;
procedure TCEEditorOptionsBase.setCurrLineAttribs(value: TSynSelectedColor);
begin
fCurrLineAttribs.Assign(value);
end;
procedure TCEEditorOptionsBase.setD2Syn(value: TPersistent); procedure TCEEditorOptionsBase.setD2Syn(value: TPersistent);
begin begin
D2Syn.Assign(value); D2Syn.Assign(value);
@ -568,6 +584,7 @@ begin
anEditor.MouseLinkColor.Assign(fMouseLinkAttribs); anEditor.MouseLinkColor.Assign(fMouseLinkAttribs);
anEditor.BracketMatchColor.Assign(fBracketMatchAttribs); anEditor.BracketMatchColor.Assign(fBracketMatchAttribs);
anEditor.HighlightAllColor.Assign(fIdentifierMarkup); anEditor.HighlightAllColor.Assign(fIdentifierMarkup);
anEditor.LineHighlightColor.Assign(fCurrLineAttribs);
anEditor.TabWidth := tabulationWidth; anEditor.TabWidth := tabulationWidth;
anEditor.BlockIndent := blockIdentation; anEditor.BlockIndent := blockIdentation;
anEditor.ExtraLineSpacing := lineSpacing; anEditor.ExtraLineSpacing := lineSpacing;

View File

@ -499,8 +499,11 @@ begin
fPositions := TCESynMemoPositions.create(self); fPositions := TCESynMemoPositions.create(self);
fMultiDocSubject := TCEMultiDocSubject.create; fMultiDocSubject := TCEMultiDocSubject.create;
// //
HighlightAllColor.Foreground:= clNone; HighlightAllColor.Foreground := clNone;
HighlightAllColor.Background:= clSilver; HighlightAllColor.Background := clSilver;
//
LineHighlightColor.Background := color - $080808;
LineHighlightColor.Foreground := clNone;
// //
subjDocNew(TCEMultiDocSubject(fMultiDocSubject), self); subjDocNew(TCEMultiDocSubject(fMultiDocSubject), self);
end; end;