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

ComboBox: painting arrow button background if disabled is not necessary because it has the same color as the disabled component background

Browse Source
This commit is contained in:
Karl Tauber
2019-08-29 15:12:20 +02:00
parent 03246c440f
commit dbebfc5d20
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java
View File

@@ -217,27 +217,28 @@ public class FlatComboBoxUI
float arc = (c.getBorder() instanceof FlatRoundBorder) ? scale( (float) this.arc ) : 0; float arc = (c.getBorder() instanceof FlatRoundBorder) ? scale( (float) this.arc ) : 0;
int arrowX = arrowButton.getX(); int arrowX = arrowButton.getX();
int arrowWidth = arrowButton.getWidth(); int arrowWidth = arrowButton.getWidth();
boolean enabled = comboBox.isEnabled();
boolean isLeftToRight = comboBox.getComponentOrientation().isLeftToRight(); boolean isLeftToRight = comboBox.getComponentOrientation().isLeftToRight();
// paint background // paint background
g2.setColor( comboBox.isEnabled() ? c.getBackground() : disabledBackground ); g2.setColor( enabled ? c.getBackground() : disabledBackground );
FlatUIUtils.fillRoundRectangle( g2, 0, 0, width, height, focusWidth, arc ); FlatUIUtils.fillRoundRectangle( g2, 0, 0, width, height, focusWidth, arc );
// paint arrow button background // paint arrow button background
g2.setColor( comboBox.isEnabled() if( enabled ) {
? (comboBox.isEditable() ? buttonEditableBackground : buttonBackground) g2.setColor( comboBox.isEditable() ? buttonEditableBackground : buttonBackground );
: disabledBackground ); Shape oldClip = g2.getClip();
Shape oldClip = g2.getClip(); if( isLeftToRight )
if( isLeftToRight ) g2.clipRect( arrowX, 0, width - arrowX, height );
g2.clipRect( arrowX, 0, width - arrowX, height ); else
else g2.clipRect( 0, 0, arrowX + arrowWidth, height );
g2.clipRect( 0, 0, arrowX + arrowWidth, height ); FlatUIUtils.fillRoundRectangle( g2, 0, 0, width, height, focusWidth, arc );
FlatUIUtils.fillRoundRectangle( g2, 0, 0, width, height, focusWidth, arc ); g2.setClip( oldClip );
g2.setClip( oldClip ); }
if( comboBox.isEditable() ) { if( comboBox.isEditable() ) {
// paint vertical line between value and arrow button // paint vertical line between value and arrow button
g2.setColor( comboBox.isEnabled() ? borderColor : disabledBorderColor ); g2.setColor( enabled ? borderColor : disabledBorderColor );
float lw = scale( 1f ); float lw = scale( 1f );
float lx = isLeftToRight ? arrowX : arrowX + arrowWidth - lw; float lx = isLeftToRight ? arrowX : arrowX + arrowWidth - lw;
g2.fill( new Rectangle2D.Float( lx, focusWidth, lw, height - (focusWidth * 2) ) ); g2.fill( new Rectangle2D.Float( lx, focusWidth, lw, height - (focusWidth * 2) ) );