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

merged PR #63 (for issue #58) into master (with modifications)

Browse Source 
bug: AbstractButton's ContentAreaFilled=false not honored when parent is a CellRendererPane
This commit is contained in:
Karl Tauber
2020-02-11 18:34:44 +01:00
parent 37cca1b106 a1d5f65588
commit 22c06300f1
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -11,6 +11,8 @@ FlatLaf Change Log
- TabbedPane: New option to allow tab separators to take full height (to enable - TabbedPane: New option to allow tab separators to take full height (to enable
use `UIManager.put( "TabbedPane.tabSeparatorsFullHeight", true );`). (issue use `UIManager.put( "TabbedPane.tabSeparatorsFullHeight", true );`). (issue
#59, PR #62) #59, PR #62)
- CheckBox and RadioButton: Do not fill background if `contentAreaFilled` is
`false`. (issue #58, PR #63)
## 0.26 ## 0.26

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

@@ -118,11 +118,13 @@ public class FlatRadioButtonUI
@Override @Override
public void paint( Graphics g, JComponent c ) { public void paint( Graphics g, JComponent c ) {
// fill background even if opaque if // fill background even if not opaque if
// - used as cell renderer (because of selection background) // - contentAreaFilled is true and
// - if background was explicitly set to a non-UIResource color // - used as cell renderer (because of selection background)
// - or if background was explicitly set to a non-UIResource color
if( !c.isOpaque() && if( !c.isOpaque() &&
(c.getParent() instanceof CellRendererPane || !(c.getBackground() instanceof UIResource)) ) ((AbstractButton)c).isContentAreaFilled() &&
(c.getParent() instanceof CellRendererPane || !(c.getBackground() instanceof UIResource)))
{ {
g.setColor( c.getBackground() ); g.setColor( c.getBackground() );
g.fillRect( 0, 0, c.getWidth(), c.getHeight() ); g.fillRect( 0, 0, c.getWidth(), c.getHeight() );