Default colors adjustment

maccasoft · Jun 19, 2023 · 92d6ddc · 92d6ddc
1 parent b194ed2
commit 92d6ddc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/modules/spin-tools/src/com/maccasoft/propeller/OutlineViewStack.java b/modules/spin-tools/src/com/maccasoft/propeller/OutlineViewStack.java
@@ -20,10 +20,14 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 
+import com.maccasoft.propeller.internal.ColorRegistry;
+
 public class OutlineViewStack {
 
     Composite container;
     StackLayout layout;
+    Color foreground;
+    Color background;
 
     Map<Control, OutlineView> map = new HashMap<>();
 
@@ -42,14 +46,19 @@ public void widgetDisposed(DisposeEvent e) {
     public OutlineViewStack(Composite parent, int style) {
         layout = new StackLayout();
 
+        background = ColorRegistry.getColor(ColorRegistry.LIST_BACKGROUND);
+        foreground = ColorRegistry.getColor(ColorRegistry.LIST_FOREGROUND);
+
         container = new Composite(parent, style);
         container.setLayout(layout);
+        container.setBackground(background);
+        container.setForeground(foreground);
     }
 
     public OutlineView createNew() {
         OutlineView view = new OutlineView(container);
-        view.setForeground(container.getForeground());
-        view.setBackground(container.getBackground());
+        view.setForeground(foreground);
+        view.setBackground(background);
         view.getControl().addDisposeListener(disposeListener);
         map.put(view.getControl(), view);
         return view;
@@ -76,13 +85,15 @@ public void setVisible(boolean visible) {
     }
 
     public void setBackground(Color color) {
+        background = color;
         for (OutlineView view : map.values()) {
             view.setBackground(color);
         }
         container.setBackground(color);
     }
 
     public void setForeground(Color color) {
+        foreground = color;
         for (OutlineView view : map.values()) {
             view.setForeground(color);
         }

diff --git a/modules/spin-tools/src/com/maccasoft/propeller/SourceEditor.java b/modules/spin-tools/src/com/maccasoft/propeller/SourceEditor.java
@@ -1184,7 +1184,7 @@ else if ("light".equals(id)) {
 
             styleMap.put(TokenId.TYPE, new TextStyle(fontBold, new Color(0x12, 0x90, 0xC3), null));
             styleMap.put(TokenId.KEYWORD, new TextStyle(fontBold, new Color(0x00, 0xA0, 0x00), null));
-            styleMap.put(TokenId.FUNCTION, new TextStyle(fontBold, new Color(0xA7, 0xEC, 0x21), null));
+            styleMap.put(TokenId.FUNCTION, new TextStyle(fontBold, new Color(0x00, 0xA0, 0x00), null));
             styleMap.put(TokenId.OBJECT, new TextStyle(font, new Color(0x66, 0xE1, 0xF8), null));
             styleMap.put(TokenId.VARIABLE, new TextStyle(font, new Color(0x66, 0xE1, 0xF8), null));