From d9eea5d5f051b7b2d2ebcf42ecfe94d351ea9f23 Mon Sep 17 00:00:00 2001 From: drdev Date: Sat, 7 Sep 2013 17:16:20 +0000 Subject: [PATCH] Ensure status is visible on default menu bar --- src/main/java/forge/gui/menubar/FMenuBar.java | 7 ++++++- src/main/java/forge/gui/toolbox/FSkin.java | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/forge/gui/menubar/FMenuBar.java b/src/main/java/forge/gui/menubar/FMenuBar.java index d0c1b96fc76..6299ff96fb4 100644 --- a/src/main/java/forge/gui/menubar/FMenuBar.java +++ b/src/main/java/forge/gui/menubar/FMenuBar.java @@ -53,7 +53,12 @@ public class FMenuBar extends JMenuBar { add(Box.createHorizontalGlue()); // align right hack/patch. lblStatus = new JLabel(statusText); JLabelSkin labelSkin = FSkin.get(lblStatus); - labelSkin.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); + if (FSkin.isLookAndFeelSet()) { + labelSkin.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); + } + else { //ensure status is visible on default menu bar + labelSkin.setForeground(getForeground()); + } lblStatus.setFont(FSkin.getItalicFont(11)); lblStatus.setOpaque(false); add(lblStatus); diff --git a/src/main/java/forge/gui/toolbox/FSkin.java b/src/main/java/forge/gui/toolbox/FSkin.java index f61403f749f..d6067cbdcd8 100644 --- a/src/main/java/forge/gui/toolbox/FSkin.java +++ b/src/main/java/forge/gui/toolbox/FSkin.java @@ -1833,6 +1833,10 @@ public enum FSkin { italicFonts.put(size, FSkin.font.deriveFont(Font.ITALIC, size)); } + public static boolean isLookAndFeelSet() { + return ForgeLookAndFeel.isMetalLafSet; + } + /** * Sets the look and feel of the GUI based on the selected Forge theme. *