GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 08:37:25 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Use ColorUIResource for theme overrides + brighten chart series colors

Browse Source 
Toggle-off problem: applyExplicitOverrides was storing plain java.awt.Color
values via UIManager.put.  LookAndFeel.installColorsAndFont only replaces a
component's existing colour when it is null or an instance of UIResource -
plain Colors are not, so once a component picked up its dark colour it kept
that colour for the rest of the JVM lifetime even after toggling back to
light mode.  Switching every override to ColorUIResource lets subsequent
updateComponentTreeUI calls replace the cached colour cleanly.

Chart visibility: the JavaFX charts on the Channel tab (NoiseSquelchView)
were inheriting Modena's default 8-colour series palette, which has several
hues that read poorly against a dark plot background.  The existing
sdrtrunk_style.css also hardcodes .chart-symbol to solid black.  Override
.default-color0..7.chart-series-line and matching .chart-line-symbol selectors
with a brighter high-contrast palette, darken the plot background to #1c1c1c
for stronger contrast against the grid lines, and add explicit colours for
axis tick marks, alternate row fills and legend border.
This commit is contained in:
Akumas_Coffin_
2026-05-14 21:52:07 +10:00
parent 1b059de3f0
commit 16393e0cd5
2 changed files with 82 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/java/io/github/dsheirer/gui/theme/ThemeManager.java
View File

@@ -39,6 +39,7 @@ import javax.swing.LookAndFeel;
import javax.swing.SwingUtilities;
import javax.swing.UIDefaults;
import javax.swing.UIManager;
import javax.swing.plaf.ColorUIResource;
import javax.swing.plaf.metal.MetalLookAndFeel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -328,37 +329,42 @@ public class ThemeManager
private void applyExplicitOverrides(boolean darkMode)
{
Color bgPanel;
Color bgRaised;
Color bgInput;
Color bgSelection;
Color fgPrimary;
Color fgSelection;
Color fgDisabled;
Color border;
//Colors stored under UIManager keys must be ColorUIResource (or null) for
//LookAndFeel.installColorsAndFont() to overwrite a component's existing colour
//on subsequent updateComponentTreeUI calls. Using a plain java.awt.Color pins
//the component foreground/background permanently and prevents the theme from
//ever toggling back.
ColorUIResource bgPanel;
ColorUIResource bgRaised;
ColorUIResource bgInput;
ColorUIResource bgSelection;
ColorUIResource fgPrimary;
ColorUIResource fgSelection;
ColorUIResource fgDisabled;
ColorUIResource border;
if(darkMode)
{
bgPanel = new Color(0x2b2b2b);
bgRaised = new Color(0x3c3f41);
bgInput = new Color(0x313335);
bgSelection = new Color(0x214283);
fgPrimary = new Color(0xe6e6e6);
fgSelection = Color.WHITE;
fgDisabled = new Color(0x6a6a6a);
border = new Color(0x4f5356);
bgPanel = new ColorUIResource(0x2b2b2b);
bgRaised = new ColorUIResource(0x3c3f41);
bgInput = new ColorUIResource(0x313335);
bgSelection = new ColorUIResource(0x214283);
fgPrimary = new ColorUIResource(0xe6e6e6);
fgSelection = new ColorUIResource(Color.WHITE);
fgDisabled = new ColorUIResource(0x6a6a6a);
border = new ColorUIResource(0x4f5356);
}
else
{
//Light mode mirrors FlatLightLaf's palette.
bgPanel = new Color(0xf2f2f2);
bgRaised = new Color(0xffffff);
bgInput = new Color(0xffffff);
bgSelection = new Color(0x2675bf);
fgPrimary = new Color(0x1e1e1e);
fgSelection = Color.WHITE;
fgDisabled = new Color(0x8c8c8c);
border = new Color(0xc4c4c4);
bgPanel = new ColorUIResource(0xf2f2f2);
bgRaised = new ColorUIResource(0xffffff);
bgInput = new ColorUIResource(0xffffff);
bgSelection = new ColorUIResource(0x2675bf);
fgPrimary = new ColorUIResource(0x1e1e1e);
fgSelection = new ColorUIResource(Color.WHITE);
fgDisabled = new ColorUIResource(0x8c8c8c);
border = new ColorUIResource(0xc4c4c4);
}
String[] simpleComponents = {
@@ -406,7 +412,7 @@ public class ThemeManager
}
UIManager.put("Table.gridColor", border);
UIManager.put("Table.alternateRowColor", new Color(darkMode ? 0x353739 : 0xfafafa));
UIManager.put("Table.alternateRowColor", new ColorUIResource(darkMode ? 0x353739 : 0xfafafa));
UIManager.put("TableHeader.background", bgRaised);
UIManager.put("TableHeader.foreground", fgPrimary);
UIManager.put("TableHeader.cellBorder", javax.swing.BorderFactory.createMatteBorder(0, 0, 1, 1, border));