From 98b156bdde4885dde7a3924d1ab0fb1629a57964 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Wed, 30 Jun 2021 00:01:33 +0200 Subject: [PATCH] TextComponents: use focusedBackground also if not editable (but enabled) (PR #338) --- .../main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java index d80ac851..28bf85a5 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java @@ -199,14 +199,14 @@ public class FlatTextFieldUI if( !(background instanceof UIResource) ) return background; + // focused + if( focusedBackground != null && FlatUIUtils.isPermanentFocusOwner( c ) ) + return focusedBackground; + // for compatibility with IntelliJ themes if( isIntelliJTheme && (!c.isEnabled() || !c.isEditable()) ) return FlatUIUtils.getParentBackground( c ); - // focused and editable - if( focusedBackground != null && c.isEditable() && FlatUIUtils.isPermanentFocusOwner( c ) ) - return focusedBackground; - return background; }