angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-13 07:17:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed color of links in HTML text

Browse Source
This commit is contained in:
Karl Tauber
2019-11-28 17:04:15 +01:00
parent 7b5a9d9949
commit a99ffd4821
8 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -9,6 +9,7 @@ FlatLaf Change Log
"FlatLaf". Use `UIManager.getLookAndFeel().getID().startsWith( "FlatLaf" )` to "FlatLaf". Use `UIManager.getLookAndFeel().getID().startsWith( "FlatLaf" )` to
check whether the current look and feel is FlatLaf. check whether the current look and feel is FlatLaf.
- Fixed selection background of checkbox in table cell. - Fixed selection background of checkbox in table cell.
- Fixed color of links in HTML text.
- Fixed jittery submenu rendering on Mac. (issue #10) - Fixed jittery submenu rendering on Mac. (issue #10)
- Button: Make button square if button text is "..." or a single character. - Button: Make button square if button text is "..." or a single character.
- ComboBox: Fixed issues with NetBeans `org.openide.awt.ColorComboBox` - ComboBox: Fixed issues with NetBeans `org.openide.awt.ColorComboBox`

11
flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
View File

@@ -42,6 +42,7 @@ import javax.swing.plaf.ColorUIResource;
import javax.swing.plaf.FontUIResource; import javax.swing.plaf.FontUIResource;
import javax.swing.plaf.basic.BasicLookAndFeel; import javax.swing.plaf.basic.BasicLookAndFeel;
import javax.swing.plaf.metal.MetalLookAndFeel; import javax.swing.plaf.metal.MetalLookAndFeel;
import javax.swing.text.html.HTMLEditorKit;
import com.formdev.flatlaf.util.SystemInfo; import com.formdev.flatlaf.util.SystemInfo;
import com.formdev.flatlaf.util.UIScale; import com.formdev.flatlaf.util.UIScale;
@@ -149,6 +150,9 @@ public abstract class FlatLaf
mnemonicListener = null; mnemonicListener = null;
} }
// restore default link color
new HTMLEditorKit().getStyleSheet().addRule( "a { color: blue; }" );
if( base != null ) if( base != null )
base.uninitialize(); base.uninitialize();
@@ -217,6 +221,13 @@ public abstract class FlatLaf
if( useScreenMenuBar ) if( useScreenMenuBar )
defaults.put( "MenuBarUI", aquaMenuBarUI ); defaults.put( "MenuBarUI", aquaMenuBarUI );
// update link color in HTML text
Color linkColor = defaults.getColor( "Component.linkColor" );
if( linkColor != null ) {
new HTMLEditorKit().getStyleSheet().addRule(
String.format( "a { color: #%06x; }", linkColor.getRGB() & 0xffffff ) );
}
return defaults; return defaults;
} }

1
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
View File

@@ -122,6 +122,7 @@ Component.borderColor=#646464
Component.disabledBorderColor=#646464 Component.disabledBorderColor=#646464
Component.focusedBorderColor=#466d94 Component.focusedBorderColor=#466d94
Component.focusColor=#3d6185 Component.focusColor=#3d6185
Component.linkColor=#589df6
#---- List ---- #---- List ----

1
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties
View File

@@ -124,6 +124,7 @@ Component.borderColor=#c4c4c4
Component.disabledBorderColor=#cfcfcf Component.disabledBorderColor=#cfcfcf
Component.focusedBorderColor=#87afda Component.focusedBorderColor=#87afda
Component.focusColor=#97c3f3 Component.focusColor=#97c3f3
Component.linkColor=#4a78c2
#---- HelpButton ---- #---- HelpButton ----

2
flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/OptionPanePanel.java
View File

@@ -296,7 +296,7 @@ class OptionPanePanel
private JOptionPane optionPane; private JOptionPane optionPane;
ShowDialogLinkLabel() { ShowDialogLinkLabel() {
setText( "<html><a href=\"#\" color=\"#589df6\">Show dialog</a></html>" ); setText( "<html><a href=\"#\">Show dialog</a></html>" );
addMouseListener( new MouseAdapter() { addMouseListener( new MouseAdapter() {
@Override @Override

6
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.java
View File

@@ -784,7 +784,7 @@ public class FlatComponentsTest
"[]")); "[]"));
//---- label3 ---- //---- label3 ----
label3.setText("<html>JLabel HTML<br>Sample <b>content</b><br> <u>text</u></html>"); label3.setText("<html>JLabel HTML<br>Sample <b>content</b><br> <u>text</u> with <a href=\"#\">link</a></html>");
panel3.add(label3, "cell 0 0"); panel3.add(label3, "cell 0 0");
//======== scrollPane15 ======== //======== scrollPane15 ========
@@ -792,7 +792,7 @@ public class FlatComponentsTest
//---- editorPane6 ---- //---- editorPane6 ----
editorPane6.setContentType("text/html"); editorPane6.setContentType("text/html");
editorPane6.setText("JEditorPane HTML<br>Sample <b>content</b><br> <u>text</u>"); editorPane6.setText("JEditorPane HTML<br>Sample <b>content</b><br> <u>text</u> with <a href=\"#\">link</a>");
scrollPane15.setViewportView(editorPane6); scrollPane15.setViewportView(editorPane6);
} }
panel3.add(scrollPane15, "cell 0 1,grow"); panel3.add(scrollPane15, "cell 0 1,grow");
@@ -802,7 +802,7 @@ public class FlatComponentsTest
//---- textPane6 ---- //---- textPane6 ----
textPane6.setContentType("text/html"); textPane6.setContentType("text/html");
textPane6.setText("JTextPane HTML<br>Sample <b>content</b><br> <u>text</u>"); textPane6.setText("JTextPane HTML<br>Sample <b>content</b><br> <u>text</u> with <a href=\"#\">link</a>");
scrollPane16.setViewportView(textPane6); scrollPane16.setViewportView(textPane6);
} }
panel3.add(scrollPane16, "cell 0 2,grow"); panel3.add(scrollPane16, "cell 0 2,grow");

6
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatComponentsTest.jfd
View File

@@ -737,7 +737,7 @@ new FormModel {
"opaque": false "opaque": false
add( new FormComponent( "javax.swing.JLabel" ) { add( new FormComponent( "javax.swing.JLabel" ) {
name: "label3" name: "label3"
"text": "<html>JLabel HTML<br>Sample <b>content</b><br> <u>text</u></html>" "text": "<html>JLabel HTML<br>Sample <b>content</b><br> <u>text</u> with <a href=\"#\">link</a></html>"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 0" "value": "cell 0 0"
} ) } )
@@ -746,7 +746,7 @@ new FormModel {
add( new FormComponent( "javax.swing.JEditorPane" ) { add( new FormComponent( "javax.swing.JEditorPane" ) {
name: "editorPane6" name: "editorPane6"
"contentType": "text/html" "contentType": "text/html"
"text": "JEditorPane HTML<br>Sample <b>content</b><br> <u>text</u>" "text": "JEditorPane HTML<br>Sample <b>content</b><br> <u>text</u> with <a href=\"#\">link</a>"
} ) } )
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 1,grow" "value": "cell 0 1,grow"
@@ -756,7 +756,7 @@ new FormModel {
add( new FormComponent( "javax.swing.JTextPane" ) { add( new FormComponent( "javax.swing.JTextPane" ) {
name: "textPane6" name: "textPane6"
"contentType": "text/html" "contentType": "text/html"
"text": "JTextPane HTML<br>Sample <b>content</b><br> <u>text</u>" "text": "JTextPane HTML<br>Sample <b>content</b><br> <u>text</u> with <a href=\"#\">link</a>"
} ) } )
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 2,grow" "value": "cell 0 2,grow"

2
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatOptionPaneTest.java
View File

@@ -296,7 +296,7 @@ public class FlatOptionPaneTest
private JOptionPane optionPane; private JOptionPane optionPane;
ShowDialogLinkLabel() { ShowDialogLinkLabel() {
setText( "<html><a href=\"#\" color=\"#589df6\">Show dialog</a></html>" ); setText( "<html><a href=\"#\">Show dialog</a></html>" );
addMouseListener( new MouseAdapter() { addMouseListener( new MouseAdapter() {
@Override @Override