hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve colors for borderColor

Browse Source
This commit is contained in:
SiboVG 2024-08-12 21:39:16 +02:00
parent 1d13bdc593
commit fe162d4abf
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swing/src/main/java/info/openrocket/swing/gui/theme/UITheme.java
View File

@ -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 // 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 { public interface Theme {
void applyTheme(); void applyTheme();
@ -1814,9 +1815,6 @@ public class UITheme {
private static void postApplyTheme(Theme theme) { private static void postApplyTheme(Theme theme) {
final SwingPreferences prefs = (SwingPreferences) Application.getPreferences(); 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 // Clear custom default font when switching to non-FlatLaf LaF
if (!(UIManager.getLookAndFeel() instanceof FlatLaf)) { if (!(UIManager.getLookAndFeel() instanceof FlatLaf)) {
UIManager.put("defaultFont", null); UIManager.put("defaultFont", null);

2
swing/src/main/resources/themes/FlatDarculaLaf.properties
View File

@ -6,4 +6,4 @@ Slider.trackColor = #a3a3a3cc
SplitPaneDivider.hoverColor = lighten(@background, 5%) SplitPaneDivider.hoverColor = lighten(@background, 5%)
# Custom OpenRocket keys # Custom OpenRocket keys
OR.ScrollPane.borderColor = #a3a3a3cc OR.ScrollPane.borderColor = #8a8a8acc

3
swing/src/main/resources/themes/FlatLaf.properties
View File

@ -18,8 +18,9 @@ Tree.rendererMargins = 2, 0, 3, 0
TextArea.margin = 10, 10, 10, 10 TextArea.margin = 10, 10, 10, 10
ScrollPane.smoothScrolling = true ScrollPane.smoothScrolling = true
ScrollPane.border = info.openrocket.swing.gui.theme.ORScrollPaneBorder ScrollPane.border = info.openrocket.swing.gui.theme.ORScrollPaneBorder
TextField.border = info.openrocket.swing.gui.theme.ORScrollPaneBorder
Slider.trackWidth = 3 Slider.trackWidth = 3
# Custom OpenRocket keys # Custom OpenRocket keys
OR.ScrollPane.borderColor = #000000 OR.ScrollPane.borderColor = #969696

3
swing/src/main/resources/themes/IntelliJTheme$ThemeLaf.properties
View File

@ -6,5 +6,4 @@
[One_Dark]SplitPaneDivider.hoverColor = lighten(@background, 5%) [One_Dark]SplitPaneDivider.hoverColor = lighten(@background, 5%)
# Custom OpenRocket keys # Custom OpenRocket keys
#[One_Dark]OR.ScrollPane.borderColor = #616365 [One_Dark]OR.ScrollPane.borderColor = #6e7275
[One_Dark]ScrollPane.borderColor = #FF0000