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

TextField, FormattedTextField, PasswordField and ComboBox: fixed alignment of placeholder text in right-to-left component orientation

Browse Source
This commit is contained in:
Karl Tauber
2021-09-02 16:18:53 +02:00
parent 09a18b2305
commit 51d7bc2c37
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -17,6 +17,8 @@ FlatLaf Change Log
since FlatLaf 1.3) since FlatLaf 1.3)
- OptionPane: Fixed `OptionPane.sameSizeButtons`, which did not work as expected - OptionPane: Fixed `OptionPane.sameSizeButtons`, which did not work as expected
when setting to `false`. when setting to `false`.
- TextField, FormattedTextField, PasswordField and ComboBox: Fixed alignment of
placeholder text in right-to-left component orientation.
## 1.5 ## 1.5

5
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTextFieldUI.java
View File

@@ -237,12 +237,13 @@ public class FlatTextFieldUI
// compute placeholder location // compute placeholder location
Rectangle r = getVisibleEditorRect(); Rectangle r = getVisibleEditorRect();
FontMetrics fm = c.getFontMetrics( c.getFont() ); FontMetrics fm = c.getFontMetrics( c.getFont() );
String clippedPlaceholder = JavaCompatibility.getClippedString( c, fm, (String) placeholder, r.width );
int x = r.x + (c.getComponentOrientation().isLeftToRight() ? 0 : r.width - fm.stringWidth( clippedPlaceholder ));
int y = r.y + fm.getAscent() + ((r.height - fm.getHeight()) / 2); int y = r.y + fm.getAscent() + ((r.height - fm.getHeight()) / 2);
// paint placeholder // paint placeholder
g.setColor( placeholderForeground ); g.setColor( placeholderForeground );
String clippedPlaceholder = JavaCompatibility.getClippedString( c, fm, (String) placeholder, r.width ); FlatUIUtils.drawString( c, g, clippedPlaceholder, x, y );
FlatUIUtils.drawString( c, g, clippedPlaceholder, r.x, y );
} }
@Override @Override