Settings form: Improve editor colors

Source/editor/simba.editor.pas

@@ -20,6 +20,7 @@ interface
 type
   TSimbaEditor = class(TSimbaSynEdit)
   protected
+    FUseSimbaColors: Boolean;
     FAutoComplete: TSimbaAutoComplete;
     FParamHint: TSimbaParamHint;
 
@@ -42,19 +43,19 @@   TSimbaEditor = class(TSimbaSynEdit)
 
     procedure FontChanged(Sender: TObject); override;
     procedure SimbaSettingChanged(Setting: TSimbaSetting);
+    procedure DoSimbaSettingChanged_Colors(Setting: TSimbaSetting);
 
     procedure DoDragDrop(Sender, Source: TObject; X, Y: Integer);
     procedure DoDragOver(Sender, Source: TObject; X, Y: Integer; State: TDragState; var Accept: Boolean);
 
     // Temp line coloring
     procedure DoSpecialLineColor(Sender: TObject; Line: Integer; var Special: Boolean; AMarkup: TSynSelectedColor);
-    // Enable/Disable TSynEditMarkupHighlightAllCaret depending on has selection
-    procedure DoStatusChanged(Sender: TObject; Changes: TSynStatusChanges);
 
     procedure SetUpdateState(NewUpdating: Boolean; Sender: TObject); override;
 
     procedure SetColorModified(Value: TColor);
     procedure SetColorSaved(Value: TColor);
+    procedure SetUseSimbaColors(Value: Boolean);
   public
     FileName: String;
 
@@ -68,6 +69,7 @@   TSimbaEditor = class(TSimbaSynEdit)
 
     property ColorSaved: TColor read FColorSaved write SetColorSaved;
     property ColorModified: TColor read FColorModified write SetColorModified;
+    property UseSimbaColors: Boolean read FUseSimbaColors write SetUseSimbaColors;
 
     function GetCaretPos(GoBackToWord: Boolean): Integer;
 
@@ -93,7 +95,7 @@   TSimbaEditor = class(TSimbaSynEdit)
     procedure ClearFocusedLines;
     procedure FocusLine(Line, Column: Integer; AColor: TColor);
 
-    constructor Create(AOwner: TComponent; LoadColors: Boolean = True); reintroduce;
+    constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
   end;
 
@@ -225,20 +227,13 @@ procedure TSimbaEditor.DoDragOver(Sender, Source: TObject; X, Y: Integer; State:
   Accept := Source is TTreeView;
 end;
 
-procedure TSimbaEditor.DoStatusChanged(Sender: TObject; Changes: TSynStatusChanges);
-begin
-  ClearFocusedLines();
-
-  //if (scSelection in Changes) then
-  //  MarkupByClass[TSynEditMarkupHighlightAllCaret].Enabled := SelAvail;
-end;
-
 procedure TSimbaEditor.SetUpdateState(NewUpdating: Boolean; Sender: TObject);
 begin
   inherited SetUpdateState(NewUpdating, Sender);
 
   if (not NewUpdating) and (FLastTextChangeStamp <> ChangeStamp) then
   begin
+    ClearFocusedLines();
     if Assigned(FModifiedEvent) then
       FModifiedEvent(Self);
 
@@ -278,6 +273,16 @@ procedure TSimbaEditor.SetColorSaved(Value: TColor);
   ModifiedLinesGutter.ColorSaved := FColorSaved;
 end;
 
+procedure TSimbaEditor.SetUseSimbaColors(Value: Boolean);
+begin
+  if (FUseSimbaColors = Value) then
+    Exit;
+  FUseSimbaColors := Value;
+
+  if FUseSimbaColors then
+    FAttributes.LoadFromFile(SimbaSettings.Editor.CustomColors.Value);
+end;
+
 procedure TSimbaEditor.FontChanged(Sender: TObject);
 begin
   inherited FontChanged(Sender);
@@ -301,11 +306,6 @@ procedure TSimbaEditor.SimbaSettingChanged(Setting: TSimbaSetting);
           Font.Name := Setting.Value;
       end;
 
-    'Editor.CustomColors':
-      begin
-        FAttributes.LoadFromFile(Setting.Value);
-      end;
-
     'Editor.RightMargin':
       begin
         RightEdge := Setting.Value;
@@ -360,6 +360,12 @@ procedure TSimbaEditor.SimbaSettingChanged(Setting: TSimbaSetting);
   end;
 end;
 
+procedure TSimbaEditor.DoSimbaSettingChanged_Colors(Setting: TSimbaSetting);
+begin
+  if FUseSimbaColors then
+    FAttributes.LoadFromFile(Setting.Value);
+end;
+
 procedure TSimbaEditor.DoSpecialLineColor(Sender: TObject; Line: Integer; var Special: Boolean; AMarkup: TSynSelectedColor);
 var
   I: Integer;
@@ -438,7 +444,7 @@ function TSimbaEditor.GetExpressionEx(X, Y: Integer): String;
   Result := GetExpression(EndX - 1, Y);
 end;
 
-constructor TSimbaEditor.Create(AOwner: TComponent; LoadColors: Boolean);
+constructor TSimbaEditor.Create(AOwner: TComponent);
 var
   I: Integer;
 begin
@@ -466,8 +472,6 @@ constructor TSimbaEditor.Create(AOwner: TComponent; LoadColors: Boolean);
 
   MouseActions.AddCommand(emcOverViewGutterScrollTo, False, LazSynEditMouseCmdsTypes.mbLeft, ccSingle, cdDown, [], []);
 
-  RegisterStatusChangedHandler(@DoStatusChanged, [scCaretX, scCaretY, scModified, scSelection]);
-
   Highlighter := TSynFreePascalSyn.Create(Self);
 
   FScreenCaretPainterClass := TSynEditScreenCaretPainterInternal;
@@ -516,8 +520,6 @@ constructor TSimbaEditor.Create(AOwner: TComponent; LoadColors: Boolean);
   Gutter.LineNumberPart().Visible := True;
   Gutter.CodeFoldPart().Visible   := True;
 
-  //if LoadColors then
-  //  SimbaSettingChanged(SimbaSettings.Editor.CustomColors);
   SimbaSettingChanged(SimbaSettings.Editor.AllowCaretPastEOL);
   SimbaSettingChanged(SimbaSettings.Editor.RightMarginVisible);
   SimbaSettingChanged(SimbaSettings.Editor.AntiAliased);
@@ -526,6 +528,9 @@ constructor TSimbaEditor.Create(AOwner: TComponent; LoadColors: Boolean);
   SimbaSettingChanged(SimbaSettings.General.MacOSKeystrokes);
 
   SimbaSettings.RegisterChangeHandler(@SimbaSettingChanged);
+
+  with SimbaSettings do
+    RegisterChangeHandler(Self, Editor.CustomColors, @DoSimbaSettingChanged_Colors);
 end;
 
 destructor TSimbaEditor.Destroy;

Source/editor/simba.editor_attributes.pas

@@ -332,15 +332,14 @@ constructor TSimbaEditor_Attributes.Create(Editor: TSynEdit);
     MarkupInfo.Background := RGBToColor(128, 0, 128);
     MarkupInfo.BackAlpha := 220;
 
-    Add('Editor.Highlight All', MarkupInfo);
+    Add('Editor.Find Matches', MarkupInfo);
   end;
 
   Add('Editor.Line Highlight', Editor.LineHighlightColor);
   Add('Editor.Folded Code', Editor.FoldedCodeColor);
   Add('Editor.Folded Code Line', Editor.FoldedCodeLineColor);
   Add('Editor.Bracket Match', Editor.BracketMatchColor);
   Add('Editor.Selected', Editor.SelectedColor);
-  Add('Editor.Highlight All', Editor.HighlightAllColor);
   Add('Editor.Mouse Link', Editor.MouseLinkColor);
   Add('Editor.Background', TSimbaEditor_BackgroundColorAttribute.Create());
   Add('Editor.Indent Line', TSimbaEditor_IndentColorAttribute.Create());

Source/forms/simba.functionlistform.pas

@@ -73,7 +73,6 @@     TFunctionListState = record
     // Sort so order is: Types, Constants, Variables, Methods
     function CompareDecl(A, B: TTreeNode): Integer;
   public
-
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
   end;