From e516ddb2235c88d269fc7aca337502e4f41071cb Mon Sep 17 00:00:00 2001 From: SiboVG Date: Sat, 4 Jun 2022 01:56:33 +0200 Subject: [PATCH] [#1099] Fix button grey out on macOS --- .../src/net/sf/openrocket/gui/widgets/SelectColorButton.java | 4 ++++ .../sf/openrocket/gui/widgets/SelectColorToggleButton.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/swing/src/net/sf/openrocket/gui/widgets/SelectColorButton.java b/swing/src/net/sf/openrocket/gui/widgets/SelectColorButton.java index 5fd39f611..6406d3516 100644 --- a/swing/src/net/sf/openrocket/gui/widgets/SelectColorButton.java +++ b/swing/src/net/sf/openrocket/gui/widgets/SelectColorButton.java @@ -38,6 +38,10 @@ public class SelectColorButton extends JButton { if (UIManager.getColor("Button.selectForeground") == null || UIManager.getColor("Button.foreground") == null) return; + + // Fixes the issue of the background of the button not being blue when selected on macOS + putClientProperty("JButton.buttonType", "segmented-only"); + addChangeListener(new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { diff --git a/swing/src/net/sf/openrocket/gui/widgets/SelectColorToggleButton.java b/swing/src/net/sf/openrocket/gui/widgets/SelectColorToggleButton.java index 3b7ada39e..8ed0873b0 100644 --- a/swing/src/net/sf/openrocket/gui/widgets/SelectColorToggleButton.java +++ b/swing/src/net/sf/openrocket/gui/widgets/SelectColorToggleButton.java @@ -64,6 +64,9 @@ public class SelectColorToggleButton extends JToggleButton { || UIManager.getColor("ToggleButton.foreground") == null) return; + // Fixes the issue of the background of the button not being blue when selected on macOS + putClientProperty("JButton.buttonType", "segmented-only"); + // Case: frame goes out of focus addPropertyChangeListener("Frame.active", new PropertyChangeListener() { @Override