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

TextArea: fixed background if explicit color is set

Browse Source
This commit is contained in:
Karl Tauber
2019-08-27 12:45:16 +02:00
parent 0d382a0d25
commit d9c9cce194
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextAreaUI.java
View File

@@ -21,6 +21,7 @@ import java.awt.Graphics;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.UIManager; import javax.swing.UIManager;
import javax.swing.plaf.ComponentUI; import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.UIResource;
import javax.swing.plaf.basic.BasicTextAreaUI; import javax.swing.plaf.basic.BasicTextAreaUI;
import javax.swing.text.JTextComponent; import javax.swing.text.JTextComponent;
@@ -56,9 +57,12 @@ public class FlatTextAreaUI
protected void paintBackground( Graphics g ) { protected void paintBackground( Graphics g ) {
JTextComponent c = getComponent(); JTextComponent c = getComponent();
g.setColor( !c.isEnabled() Color background = c.getBackground();
? disabledBackground g.setColor( !(background instanceof UIResource)
: (!c.isEditable() ? inactiveBackground : c.getBackground()) ); ? background
: (!c.isEnabled()
? disabledBackground
: (!c.isEditable() ? inactiveBackground : background)) );
g.fillRect( 0, 0, c.getWidth(), c.getHeight() ); g.fillRect( 0, 0, c.getWidth(), c.getHeight() );
} }
} }