Changeset 6935 in josm for trunk

Timestamp:

2014-03-27T23:07:34+01:00 (11 years ago)

Author:

Don-vip

Message:

see #3764 - special handling for Nimbus

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• GettingStarted.java (modified) (1 diff)
• widgets/JosmEditorPane.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/GettingStarted.java

@@ -57 +57 @@
             setOpaque(false);
             addHyperlinkListener(this);
+            adaptForNimbus(this);
         }
 

trunk/src/org/openstreetmap/josm/gui/widgets/JosmEditorPane.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.widgets;
 
+import java.awt.Color;
 import java.awt.Font;
 import java.io.IOException;
@@ -10 +11 @@
 
 import javax.swing.JEditorPane;
+import javax.swing.LookAndFeel;
+import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.text.html.StyleSheet;
@@ -80 +83 @@
         return result;
     }
-
+    
     /**
-     * Adapts an {@link JEditorPane} to be used as a powerful replacement of {@link javax.swing.JLabel}.
+     * Adapts a {@link JEditorPane} to be used as a powerful replacement of {@link javax.swing.JLabel}.
      * @param pane The editor pane to adapt
      * @param allBold If {@code true}, makes all text to be displayed in bold
@@ -90 +93 @@
         pane.setOpaque(false);
         pane.setEditable(false);
+        adaptForNimbus(pane);
 
         JosmHTMLEditorKit kit = new JosmHTMLEditorKit();
@@ -103 +107 @@
     }
 
+    /**
+     * Adapts a {@link JEditorPane} for Nimbus look and feel.
+     * See <a href="https://stackoverflow.com/q/15228336/2257172">this StackOverflow question</a>.
+     * @param pane The editor pane to adapt
+     * @since 6935
+     */
+    public static void adaptForNimbus(JEditorPane pane) {
+        LookAndFeel currentLAF = UIManager.getLookAndFeel();
+        if (currentLAF != null && "Nimbus".equals(currentLAF.getName())) {
+            Color bgColor = UIManager.getColor("Label.background");
+            UIDefaults defaults = new UIDefaults();
+            defaults.put("EditorPane[Enabled].backgroundPainter", bgColor);
+            pane.putClientProperty("Nimbus.Overrides", defaults);
+            pane.putClientProperty("Nimbus.Overrides.InheritDefaults", true);
+            pane.setBackground(bgColor);
+        }
+    }
+
     private static String getFontRule(Font f) {
         return MessageFormat.format(