Changeset 17117 in josm for trunk/src/org

Timestamp:

2020-10-08T20:26:00+02:00 (4 years ago)

Author:

simon04

Message:

see #19819 - Obtain link color using UIManager (patch by DevCharly)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• GettingStarted.java (modified) (1 diff)
• help/HelpBrowser.java (modified) (1 diff)
• widgets/HtmlPanel.java (modified) (1 diff)
• widgets/JosmEditorPane.java (modified) (3 diffs)

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

@@ -57 +57 @@
             + "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";

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

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

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

@@ -57 +57 @@
                 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();

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

@@ -16 +16 @@
 
 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;
@@ -101 +102 @@
         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}");
@@ -141 +142 @@
     }
 
+    /**
+     * 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() {