From b0428a1d8b376ac7a73ae5c57f21ffca7e664372 Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Tue, 20 Oct 2026 03:46:53 -0400 Subject: [PATCH] #2509 Tuner frequency control highlight color adapts to color theme (#2510) Co-authored-by: denny --- .../gui/control/JFrequencyControl.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/io/github/dsheirer/gui/control/JFrequencyControl.java b/src/main/java/io/github/dsheirer/gui/control/JFrequencyControl.java index 3e596561..4e0d79cd 100644 --- a/src/main/java/io/github/dsheirer/gui/control/JFrequencyControl.java +++ b/src/main/java/io/github/dsheirer/gui/control/JFrequencyControl.java @@ -45,6 +45,7 @@ import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTextField; +import javax.swing.UIManager; /** * Custom frequency controller for displaying or editing frequency values in MHz. @@ -556,19 +557,20 @@ public class JFrequencyControl extends JPanel implements ISourceEventProcessor @Override public void mouseEntered(MouseEvent e) { - Digit.this.setBackground(mHighlightColor); - repaint(); - } + Color bg = UIManager.getColor("TextField.selectionBackground"); + Color fg = UIManager.getColor("TextField.selectionForeground"); + Digit.this.setBackground(bg != null ? bg : Color.YELLOW); + Digit.this.setForeground(fg != null ? fg : Color.BLACK); + repaint(); } @Override public void mouseExited(MouseEvent e) { - //Restore the LAF text-field background rather than hardcoding white so the digit - //cells match the active theme when the mouse leaves. - Color textBg = javax.swing.UIManager.getColor("TextField.background"); - Digit.this.setBackground(textBg != null ? textBg : Color.WHITE); - repaint(); - } + Color bg = UIManager.getColor("TextField.background"); + Color fg = UIManager.getColor("TextField.foreground"); + Digit.this.setBackground(bg != null ? bg : Color.WHITE); + Digit.this.setForeground(fg != null ? fg : Color.BLACK); + repaint(); } @Override public void mouseWheelMoved(MouseWheelEvent e)