Improve customization of scrollbar & toolbar.

Source/Simba.lpi

@@ -308,7 +308,7 @@
         <PackageName Value="LCL"/>
       </Item4>
     </RequiredPackages>
-    <Units Count="171">
+    <Units Count="172">
       <Unit0>
         <Filename Value="Simba.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -1068,6 +1068,10 @@
         <Filename Value="components/simba.component_button.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit170>
+      <Unit171>
+        <Filename Value="components/simba.component_scrollbar.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit171>
     </Units>
   </ProjectOptions>
   <CompilerOptions>

Source/components/simba.component_menubar.pas

@@ -86,6 +86,7 @@ procedure TSimbaMainMenuBar.Paint;
   Style.Alignment := taCenter;
   Style.Layout := tlCenter;
 
+  Canvas.Font.Color := SimbaTheme.ColorFont;
   Canvas.Brush.Color := SimbaTheme.ColorFrame;
   Canvas.FillRect(ClientRect);
 
@@ -164,8 +165,8 @@ constructor TSimbaMainMenuBar.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);
 
+  ParentFont := True;
   ControlStyle := ControlStyle + [csOpaque];
-  Font.Color := SimbaTheme.ColorFont;
 
   CalculateSizes();
 end;

Source/components/simba.component_scrollbar.pas

@@ -0,0 +1,48 @@
+unit simba.component_scrollbar;
+
+{$i simba.inc}
+
+interface
+
+uses
+  Classes, SysUtils,
+  ATScrollBar, simba.settings;
+
+type
+  TSimbaScrollBar = class(TATScrollBar)
+  protected
+    procedure DoSettingChange_ScrollBarSize(Setting: TSimbaSetting);
+    procedure DoSettingChange_ScrollBarArrowSize(Setting: TSimbaSetting);
+  public
+    constructor Create(AOwner: TComponent); override;
+  end;
+
+implementation
+
+uses
+  simba.mufasatypes;
+
+procedure TSimbaScrollBar.DoSettingChange_ScrollBarSize(Setting: TSimbaSetting);
+begin
+  Theme^.InitialSize := Scale96ToScreen(Setting.Value);
+
+  Update();
+end;
+
+procedure TSimbaScrollBar.DoSettingChange_ScrollBarArrowSize(Setting: TSimbaSetting);
+begin
+  Theme^.ArrowSize := Setting.Value;
+
+  Update();
+end;
+
+constructor TSimbaScrollBar.Create(AOwner: TComponent);
+begin
+  inherited Create(AOwner);
+
+  SimbaSettings.RegisterChangeHandler(Self, SimbaSettings.General.ScrollBarSize, @DoSettingChange_ScrollBarSize, True);
+  SimbaSettings.RegisterChangeHandler(Self, SimbaSettings.General.ScrollBarArrowSize, @DoSettingChange_ScrollBarArrowSize, True);
+end;
+
+end.
+

Source/components/simba.component_synedit.pas

@@ -8,13 +8,13 @@ interface
   Classes, SysUtils, Controls, Forms, StdCtrls, Graphics,
   SynEdit, SynEditTypes, SynEditFoldedView, SynEditTextBuffer, SynEditMarkupSelection,
   LazSynEditText,
-  ATScrollBar;
+  simba.component_scrollbar;
 
 type
   TSimbaSynEdit = class(TSynEdit)
   protected
-    FScrollbarVert: TATScrollbar;
-    FScrollbarHorz: TATScrollbar;
+    FScrollbarVert: TSimbaScrollBar;
+    FScrollbarHorz: TSimbaScrollBar;
 
     procedure DoVertScrollBarChange(Sender: TObject);
     procedure DoHorzScrollBarChange(Sender: TObject);
@@ -114,11 +114,11 @@ constructor TSimbaSynEdit.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);
 
-  FScrollbarVert := TATScrollbar.Create(Self);
+  FScrollbarVert := TSimbaScrollBar.Create(Self);
   FScrollbarVert.Kind := sbVertical;
   FScrollbarVert.OnChange := @DoVertScrollBarChange;
 
-  FScrollbarHorz := TATScrollbar.Create(Self);
+  FScrollbarHorz := TSimbaScrollBar.Create(Self);
   FScrollbarHorz.Kind := sbHorizontal;
   FScrollbarHorz.OnChange := @DoHorzScrollBarChange;
 

Source/components/simba.component_treeview.pas

@@ -13,17 +13,16 @@ interface
 
 uses
   Classes, SysUtils, Controls, Forms, Graphics, StdCtrls, ComCtrls, LMessages, LCLType, ImgList,
-  ATScrollBar,
-  simba.component_edit, simba.component_treeviewhint;
+  simba.component_edit, simba.component_treeviewhint, simba.component_scrollbar;
 
 type
   TSimbaTreeView = class;
 
   TSimbaInternalTreeView = class(TTreeView)
   protected
     FLoading: Boolean;
-    FScrollbarVert: TATScrollbar;
-    FScrollbarHorz: TATScrollbar;
+    FScrollbarVert: TSimbaScrollBar;
+    FScrollbarHorz: TSimbaScrollBar;
 
     procedure UpdateScrollBars;
     procedure DoSelectionChanged; override;
@@ -49,12 +48,14 @@   TSimbaTreeView = class(TCustomControl)
     FFilterEdit: TSimbaEdit;
     FHint: TSimbaTreeViewHint;
     FTree: TSimbaInternalTreeView;
-    FScrollbarVert: TATScrollbar;
-    FScrollbarHorz: TATScrollbar;
+    FScrollbarVert: TSimbaScrollBar;
+    FScrollbarHorz: TSimbaScrollBar;
     FOnGetNodeHint: TNodeHintEvent;
     FNodeClass: TTreeNodeClass;
     FOnAfterFilter: TNotifyEvent;
 
+    procedure FontChanged(Sender: TObject); override;
+
     procedure UpdateFilter;
 
     function GetImages: TCustomImageList;
@@ -128,19 +129,17 @@ constructor TSimbaTreeView.Create(AOwner: TComponent; NodeClass: TTreeNodeClass)
 
   FNodeClass := NodeClass;
 
-  FScrollbarVert := TATScrollbar.Create(Self);
+  FScrollbarVert := TSimbaScrollBar.Create(Self);
   FScrollbarVert.Parent := Self;
   FScrollbarVert.Kind := sbVertical;
   FScrollbarVert.Align := alRight;
-  FScrollbarVert.Width := ATScrollbarTheme.InitialSize;
   FScrollbarVert.OnChange := @ScrollVertChange;
   FScrollbarVert.Visible := True;
 
-  FScrollbarHorz := TATScrollbar.Create(Self);
+  FScrollbarHorz := TSimbaScrollBar.Create(Self);
   FScrollbarHorz.Parent := Self;
   FScrollbarHorz.Kind := sbHorizontal;
   FScrollbarHorz.Align := alBottom;
-  FScrollbarHorz.Height := ATScrollbarTheme.InitialSize;
   FScrollbarHorz.IndentCorner := 100;
   FScrollbarHorz.OnChange := @ScrollHorzChange;
   FScrollbarHorz.Visible := True;
@@ -156,13 +155,13 @@ constructor TSimbaTreeView.Create(AOwner: TComponent; NodeClass: TTreeNodeClass)
   FTree.ExpandSignType := tvestArrow;
   FTree.ExpandSignColor := clWhite;
   FTree.TreeLinePenStyle := psClear;
-  FTree.Font.Color := SimbaTheme.ColorFont;
-  FTree.BackgroundColor := SimbaTheme.ColorBackground;
-  FTree.SelectionColor := SimbaTheme.ColorActive;
   FTree.OnCreateNodeClass := @DoCreateNodeClass;
   FTree.OnMouseMove := @DoMouseMove;
   FTree.DragMode := dmAutomatic;
   FTree.TabStop := False;
+  FTree.BackgroundColor := SimbaTheme.ColorBackground;
+  FTree.SelectionColor := SimbaTheme.ColorActive;
+  FTree.Font.Color := SimbaTheme.ColorFont;
 
   FHint := TSimbaTreeViewHint.Create(FTree);
 
@@ -177,25 +176,6 @@ constructor TSimbaTreeView.Create(AOwner: TComponent; NodeClass: TTreeNodeClass)
   FFilterEdit.Font.Color := SimbaTheme.ColorFont;
   FFilterEdit.HintTextColor := clLtGray;
   FFilterEdit.HintText := '(search)';
-
-  with ATScrollbarTheme do
-  begin
-    InitialSize := Scale96ToScreen(16);
-    ThumbMinSize := Scale96ToScreen(24);
-    ThumbRoundedRect := False;
-    DirectJumpOnClickPageUpDown := True;
-
-    ColorCorner := SimbaTheme.ColorFrame;
-    ColorBG := SimbaTheme.ColorScrollBarInActive;
-    ColorThumbBorder := SimbaTheme.ColorScrollBarActive;
-    ColorThumbFill := SimbaTheme.ColorScrollBarActive;
-    ColorThumbFillOver := SimbaTheme.ColorScrollBarActive;
-    ColorThumbFillPressed := SimbaTheme.ColorScrollBarActive;
-    ColorThumbDecor := SimbaTheme.ColorScrollBarActive;
-    ColorArrowFill := SimbaTheme.ColorScrollBarActive;
-    ColorArrowBorder := SimbaTheme.ColorScrollBarActive;
-    ColorArrowSign := SimbaTheme.ColorLine;
-  end;
 end;
 
 procedure TSimbaTreeView.FullCollapse;
@@ -294,6 +274,14 @@ function TSimbaTreeView.GetTopLevelCount: Integer;
   Result := FTree.Items.TopLvlCount;
 end;
 
+procedure TSimbaTreeView.FontChanged(Sender: TObject);
+begin
+  inherited FontChanged(Sender);
+
+  FTree.Font := Self.Font;
+  FTree.Font.Color := SimbaTheme.ColorFont;
+end;
+
 procedure TSimbaTreeView.UpdateFilter;
 var
   Node, NodeParent: TTreeNode;

Source/editor/simba.editor.pas

@@ -321,29 +321,6 @@ procedure TSimbaEditor.SimbaSettingChanged(Setting: TSimbaSetting);
         else
           Options := Options - [eoTrimTrailingSpaces, eoScrollPastEol];
       end;
-
-    'General.MacOSKeystrokes':
-      begin
-        if Setting.Value then
-        begin
-          for I := 0 to Keystrokes.Count - 1 do
-            if (ssCtrl in Keystrokes[i].Shift) then
-              Keystrokes[I].Shift := Keystrokes[I].Shift - [ssCtrl] + [ssMeta];
-
-          for I := 0 to MouseActions.Count - 1 do
-            if (ssCtrl in MouseActions[i].Shift) then
-              MouseActions[I].Shift := MouseActions[I].Shift - [ssCtrl] + [ssMeta];
-        end else
-        begin
-          for I := 0 to Keystrokes.Count - 1 do
-            if (ssMeta in Keystrokes[i].Shift) then
-              Keystrokes[I].Shift := Keystrokes[I].Shift - [ssMeta] + [ssCtrl];
-
-          for I := 0 to MouseActions.Count - 1 do
-            if (ssMeta in MouseActions[i].Shift) then
-              MouseActions[I].Shift := MouseActions[I].Shift - [ssMeta] + [ssCtrl];
-        end;
-      end;
   end;
 end;
 
@@ -508,7 +485,6 @@ constructor TSimbaEditor.Create(AOwner: TComponent);
   SimbaSettingChanged(SimbaSettings.Editor.AntiAliased);
   SimbaSettingChanged(SimbaSettings.Editor.FontSize);
   SimbaSettingChanged(SimbaSettings.Editor.FontName);
-  SimbaSettingChanged(SimbaSettings.General.MacOSKeystrokes);
 
   SimbaSettings.RegisterChangeHandler(@SimbaSettingChanged);
 

Source/forms/simba.functionlistform.pas

@@ -677,6 +677,8 @@ destructor TSimbaFunctionListForm.Destroy;
 
   FCodeinsight.Free();
 
+  FSavedStates.Free();
+
   inherited Destroy();
 end;
 

Source/forms/simba.main.lfm

@@ -1,7 +1,7 @@
 object SimbaForm: TSimbaForm
-  Left = 3939
+  Left = 3579
   Height = 578
-  Top = 740
+  Top = 702
   Width = 910
   Caption = 'Simba'
   ClientHeight = 578