Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-06 22:10:54 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

ComboBox: support right-to-left

Browse Source
This commit is contained in:
Karl Tauber
2019-08-26 21:10:56 +02:00
parent 2736429893
commit 094555f75c
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,6 +129,8 @@ public class FlatComboBoxUI
float focusWidth = FlatUIUtils.getFocusWidth( c ); float focusWidth = FlatUIUtils.getFocusWidth( c );
float arc = FlatUIUtils.getComponentArc( c ); float arc = FlatUIUtils.getComponentArc( c );
int arrowX = arrowButton.getX(); int arrowX = arrowButton.getX();
int arrowWidth = arrowButton.getWidth();
boolean isLeftToRight = comboBox.getComponentOrientation().isLeftToRight();
// paint background // paint background
g2.setColor( comboBox.isEnabled() g2.setColor( comboBox.isEnabled()
@@ -143,14 +145,19 @@ public class FlatComboBoxUI
: "ComboBox.buttonBackground" ) : "ComboBox.buttonBackground" )
: "ComboBox.disabledBackground" ) ); : "ComboBox.disabledBackground" ) );
Shape oldClip = g2.getClip(); Shape oldClip = g2.getClip();
g2.clipRect( arrowX, 0, width - arrowX, height ); if( isLeftToRight )
g2.clipRect( arrowX, 0, width - arrowX, height );
else
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( FlatUIUtils.getBorderColor( comboBox.isEnabled(), false ) ); g2.setColor( FlatUIUtils.getBorderColor( comboBox.isEnabled(), false ) );
g2.fill( new Rectangle2D.Float( arrowX, focusWidth, scale( 1f ), height - (focusWidth * 2) ) ); float lw = scale( 1f );
float lx = isLeftToRight ? arrowX : arrowX + arrowWidth - lw;
g2.fill( new Rectangle2D.Float( lx, focusWidth, lw, height - (focusWidth * 2) ) );
} }
} }