diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatLabelUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatLabelUI.java index 901f4bc9..4b219374 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatLabelUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatLabelUI.java @@ -16,9 +16,13 @@ package com.formdev.flatlaf.ui; +import java.awt.Graphics; import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.UIManager; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicLabelUI; +import sun.swing.SwingUtilities2; /** * Provides the Flat LaF UI delegate for {@link javax.swing.JLabel}. @@ -35,4 +39,11 @@ public class FlatLabelUI instance = new FlatLabelUI(); return instance; } + + @Override + protected void paintDisabledText( JLabel l, Graphics g, String s, int textX, int textY ) { + int mnemIndex = l.getDisplayedMnemonicIndex(); + g.setColor( UIManager.getColor( "Label.disabledForeground" ) ); + SwingUtilities2.drawStringUnderlineCharAt( l, g, s, mnemIndex, textX, textY ); + } } diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties index c22de3a9..787ed262 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties @@ -18,3 +18,8 @@ *.background=3c3f41 *.foreground=bbbbbb + + +#---- Label ---- + +Label.disabledForeground=808080 diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties index 354dba91..8d2f8f3a 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties @@ -18,3 +18,8 @@ *.background=f2f2f2 *.foreground=000000 + + +#---- Label ---- + +Label.disabledForeground=777777 diff --git a/flatlaf-core/src/test/resources/com/formdev/flatlaf/FlatTestLaf.properties b/flatlaf-core/src/test/resources/com/formdev/flatlaf/FlatTestLaf.properties index bb0b26f3..53c70137 100644 --- a/flatlaf-core/src/test/resources/com/formdev/flatlaf/FlatTestLaf.properties +++ b/flatlaf-core/src/test/resources/com/formdev/flatlaf/FlatTestLaf.properties @@ -18,3 +18,8 @@ *.background=ccffcc *.foreground=ff0000 + + +#---- Label ---- + +Label.disabledForeground=000088