From b5fc07acc7630d07119eacdabb74fcb8dd4102d6 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Thu, 11 Feb 2021 12:04:36 +0100 Subject: [PATCH] TabbedPane: custom `TabbedPane.selectedForeground` color did not work when `TabbedPane.foreground` has also custom color (issue #257) --- CHANGELOG.md | 8 ++++++++ .../java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3a91caf..61bade10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ FlatLaf Change Log ================== +## 1.0-rc4-SNAPSHOT + +#### Fixed bugs + +- TabbedPane: Custom `TabbedPane.selectedForeground` color did not work when + `TabbedPane.foreground` has also custom color. (issue #257) + + ## 1.0-rc3 #### New features and improvements diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java index 1705c909..b500d806 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java @@ -893,7 +893,7 @@ public class FlatTabbedPaneUI Color color; if( tabPane.isEnabled() && tabPane.isEnabledAt( tabIndex ) ) { color = tabPane.getForegroundAt( tabIndex ); - if( isSelected && (color instanceof UIResource) && selectedForeground != null ) + if( isSelected && selectedForeground != null && color == tabPane.getForeground() ) color = selectedForeground; } else color = disabledForeground;