Ticket #19819: JOSM-FlatLaf-blue-links-fix.diff

src/org/openstreetmap/josm/gui/help/HelpBrowser.java

@@ -135 +135 @@
             return ss;
         }
         ss.addRule(css);
+
+        // overwrite link color
+        String linkColor = JosmEditorPane.getLinkColor(null);
+        if (linkColor != null) {
+            ss.addRule("a {color: "+linkColor+"}");
+        }
         return ss;
     }
 

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

@@ -15 +15 @@
 import javax.swing.text.html.StyleSheet;
 
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.LanguageInfo;
@@ -100 +101 @@
         final Font f = UIManager.getFont("Label.font");
         final StyleSheet ss = new StyleSheet();
         ss.addRule((allBold ? "html" : "strong, b") + " {" + getFontRule(f) + '}');
-        ss.addRule("a {text-decoration: underline; color: blue}");
+        ss.addRule("a {text-decoration: underline; color: "+getLinkColor("blue")+"}");
         ss.addRule("h1 {" + getFontRule(GuiHelper.getTitleFont()) + '}');
         ss.addRule("ol {margin-left: 1cm; margin-top: 0.1cm; margin-bottom: 0.2cm; list-style-type: decimal}");
         ss.addRule("ul {margin-left: 1cm; margin-top: 0.1cm; margin-bottom: 0.2cm; list-style-type: disc}");
@@ -140 +141 @@
         );
     }
 
+    /**
+     * Returns the color (in CSS format) that should be used for links.
+     * If the current look and feel does not provide a link color, the passed default color is used.
+     * @param defaultColor the default color
+     * @return link color
+     */
+    public static String getLinkColor(String defaultColor) {
+        Color color = UIManager.getColor("Component.linkColor");
+        return (color != null) ? ColorHelper.color2html(color) : defaultColor;
+    }
+
     @Override
     public void destroy() {
         TextContextualPopupMenu.disableMenuFor(this, launcher);

src/org/openstreetmap/josm/gui/widgets/HtmlPanel.java

@@ -56 +56 @@
                 "bold",
                 f.isItalic() ? "italic" : "normal"
         ) + '}');
-        ss.addRule("a {text-decoration: underline; color: blue}");
+        ss.addRule("a {text-decoration: underline; color: "+JosmEditorPane.getLinkColor("blue")+"}");
         ss.addRule("ul {margin-left: 1cm; list-style-type: disc}");
         JosmHTMLEditorKit kit = new JosmHTMLEditorKit();
         kit.setStyleSheet(ss);

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

@@ -56 +56 @@
     private static final String STYLE = "<style type=\"text/css\">\n"
             + "body {font-family: sans-serif; font-weight: bold; }\n"
             + "h1 {text-align: center; }\n"
-            + "a {color: #316ed9; }\n"
+            + "a {color: "+JosmEditorPane.getLinkColor("#316ed9")+"; }\n"
             + ".icon {font-size: 0; }\n"
             + "</style>\n";