Use correct foreground color when selected togglebutton is disabled. Fixes #191

5 years ago · 6d4c3bc6df
1 changed files with 3 additions and 2 deletions
--- a/core/src/main/java/com/github/weisj/darklaf/ui/togglebutton/DarkToggleButtonUI.java
+++ b/core/src/main/java/com/github/weisj/darklaf/ui/togglebutton/DarkToggleButtonUI.java
@ -133,9 +133,10 @@ public class DarkToggleButtonUI extends DarkButtonUI implements ToggleButtonCons
    @Override
    protected Color getForeground(final AbstractButton button) {
        if (button.isSelected()
+            && button.isEnabled()
+            && button.getForeground() instanceof UIResource
            && !ToggleButtonConstants.isSlider(button)
-            && !ButtonConstants.isBorderlessVariant(button)
-            && button.getForeground() instanceof UIResource) {
+            && !ButtonConstants.isBorderlessVariant(button)) {
            return selectedForeground;
        }
        return super.getForeground(button);