From fe162d4abfbcb63240ba830223e0d2262e039ea6 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Mon, 12 Aug 2024 21:39:16 +0200
Subject: [PATCH] Improve colors for borderColor

---
 .../main/java/info/openrocket/swing/gui/theme/UITheme.java    | 4 +---
 swing/src/main/resources/themes/FlatDarculaLaf.properties     | 2 +-
 swing/src/main/resources/themes/FlatLaf.properties            | 3 ++-
 .../main/resources/themes/IntelliJTheme$ThemeLaf.properties   | 3 +--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/swing/src/main/java/info/openrocket/swing/gui/theme/UITheme.java b/swing/src/main/java/info/openrocket/swing/gui/theme/UITheme.java
index e94ba1e35..db7536c4e 100644
--- a/swing/src/main/java/info/openrocket/swing/gui/theme/UITheme.java
+++ b/swing/src/main/java/info/openrocket/swing/gui/theme/UITheme.java
@@ -40,6 +40,7 @@ public class UITheme {
 
 
     // TODO: replace a bunch of this with the FlatLaf properties files, see https://www.formdev.com/flatlaf/properties-files
+    // For FlatLaf theme properties, check out swing/src/main/resources/themes
 
     public interface Theme {
         void applyTheme();
@@ -1814,9 +1815,6 @@ public class UITheme {
     private static void postApplyTheme(Theme theme) {
         final SwingPreferences prefs = (SwingPreferences) Application.getPreferences();
 
-        // TODO: For some reason, FlatLaf does not take the correct values from the properties file
-        UIManager.put("OR.ScrollPane.borderColor", theme.getBorderColor());
-
         // Clear custom default font when switching to non-FlatLaf LaF
         if (!(UIManager.getLookAndFeel() instanceof FlatLaf)) {
             UIManager.put("defaultFont", null);
diff --git a/swing/src/main/resources/themes/FlatDarculaLaf.properties b/swing/src/main/resources/themes/FlatDarculaLaf.properties
index e5c83ede0..795dcfdc1 100644
--- a/swing/src/main/resources/themes/FlatDarculaLaf.properties
+++ b/swing/src/main/resources/themes/FlatDarculaLaf.properties
@@ -6,4 +6,4 @@ Slider.trackColor = #a3a3a3cc
 SplitPaneDivider.hoverColor = lighten(@background, 5%)
 
 # Custom OpenRocket keys
-OR.ScrollPane.borderColor = #a3a3a3cc
+OR.ScrollPane.borderColor = #8a8a8acc
diff --git a/swing/src/main/resources/themes/FlatLaf.properties b/swing/src/main/resources/themes/FlatLaf.properties
index 0187ded38..b8a022a04 100644
--- a/swing/src/main/resources/themes/FlatLaf.properties
+++ b/swing/src/main/resources/themes/FlatLaf.properties
@@ -18,8 +18,9 @@ Tree.rendererMargins = 2, 0, 3, 0
 TextArea.margin = 10, 10, 10, 10
 ScrollPane.smoothScrolling = true
 ScrollPane.border = info.openrocket.swing.gui.theme.ORScrollPaneBorder
+TextField.border = info.openrocket.swing.gui.theme.ORScrollPaneBorder
 
 Slider.trackWidth = 3
 
 # Custom OpenRocket keys
-OR.ScrollPane.borderColor = #000000
\ No newline at end of file
+OR.ScrollPane.borderColor = #969696
\ No newline at end of file
diff --git a/swing/src/main/resources/themes/IntelliJTheme$ThemeLaf.properties b/swing/src/main/resources/themes/IntelliJTheme$ThemeLaf.properties
index 31087bc39..ad25db5d9 100644
--- a/swing/src/main/resources/themes/IntelliJTheme$ThemeLaf.properties
+++ b/swing/src/main/resources/themes/IntelliJTheme$ThemeLaf.properties
@@ -6,5 +6,4 @@
 [One_Dark]SplitPaneDivider.hoverColor = lighten(@background, 5%)
 
 # Custom OpenRocket keys
-#[One_Dark]OR.ScrollPane.borderColor = #616365
-[One_Dark]ScrollPane.borderColor = #FF0000
+[One_Dark]OR.ScrollPane.borderColor = #6e7275