From 49a5d9200a4f17e14917485e56d29e995e076cd4 Mon Sep 17 00:00:00 2001 From: Sibo Van Gool Date: Thu, 15 Jul 2021 20:30:02 +0200 Subject: [PATCH 1/2] [fixes #948] Added black foreground for tabbed panes --- swing/src/net/sf/openrocket/gui/util/GUIUtil.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/util/GUIUtil.java b/swing/src/net/sf/openrocket/gui/util/GUIUtil.java index d4f40c862..011784b95 100644 --- a/swing/src/net/sf/openrocket/gui/util/GUIUtil.java +++ b/swing/src/net/sf/openrocket/gui/util/GUIUtil.java @@ -1,14 +1,6 @@ package net.sf.openrocket.gui.util; -import java.awt.Component; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.Image; -import java.awt.KeyboardFocusManager; -import java.awt.Point; -import java.awt.Toolkit; -import java.awt.Window; +import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ComponentAdapter; @@ -258,6 +250,7 @@ public class GUIUtil { try { // Set system L&F UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + UIManager.put("TabbedPane.foreground", Color.black); // Check whether we have an ugly L&F LookAndFeel laf = UIManager.getLookAndFeel(); From 67929185014c2ac6a75d16acede98100dac31d31 Mon Sep 17 00:00:00 2001 From: Sibo Van Gool Date: Sat, 17 Jul 2021 14:27:14 +0200 Subject: [PATCH 2/2] [fixes #948] Only use change for OSX --- swing/src/net/sf/openrocket/gui/util/GUIUtil.java | 1 - swing/src/net/sf/openrocket/startup/OSXSetup.java | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/util/GUIUtil.java b/swing/src/net/sf/openrocket/gui/util/GUIUtil.java index 011784b95..e12526d40 100644 --- a/swing/src/net/sf/openrocket/gui/util/GUIUtil.java +++ b/swing/src/net/sf/openrocket/gui/util/GUIUtil.java @@ -250,7 +250,6 @@ public class GUIUtil { try { // Set system L&F UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - UIManager.put("TabbedPane.foreground", Color.black); // Check whether we have an ugly L&F LookAndFeel laf = UIManager.getLookAndFeel(); diff --git a/swing/src/net/sf/openrocket/startup/OSXSetup.java b/swing/src/net/sf/openrocket/startup/OSXSetup.java index cbd40cb80..3ca0a20f4 100644 --- a/swing/src/net/sf/openrocket/startup/OSXSetup.java +++ b/swing/src/net/sf/openrocket/startup/OSXSetup.java @@ -1,9 +1,6 @@ package net.sf.openrocket.startup; -import java.awt.Desktop; -import java.awt.Image; -import java.awt.Taskbar; -import java.awt.Toolkit; +import java.awt.*; import java.awt.desktop.AboutHandler; import java.awt.desktop.PreferencesHandler; import java.awt.desktop.QuitHandler; @@ -17,6 +14,8 @@ import net.sf.openrocket.gui.dialogs.AboutDialog; import net.sf.openrocket.gui.dialogs.preferences.PreferencesDialog; import net.sf.openrocket.gui.main.BasicFrame; +import javax.swing.*; + /** * Static code for initialization of OSX UI Elements: Menu, Icon, Name and * Application menu handlers. @@ -91,6 +90,9 @@ final class OSXSetup { final Taskbar osxTaskbar = Taskbar.getTaskbar(); osxTaskbar.setIconImage(dockIcon); + // Set the foreground of active tabs to black; there was a bug where you had a white background and white foreground + UIManager.put("TabbedPane.foreground", Color.black); + } catch (final Throwable t) { // None of the preceding is critical to the app, // so at worst case log an error and continue