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

PasswordField: paint caps lock icon on left side in right-to-left component orientation

Browse Source
This commit is contained in:
Karl Tauber
2021-07-09 15:14:29 +02:00
parent cc6d3c1b1a
commit 0b342acec9
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -36,6 +36,8 @@ FlatLaf Change Log
- OptionPane: Align wrapped lines to the right if component orientation is - OptionPane: Align wrapped lines to the right if component orientation is
right-to-left. (issue #350) right-to-left. (issue #350)
- PasswordField: Caps lock icon no longer painted over long text. (issue #172) - PasswordField: Caps lock icon no longer painted over long text. (issue #172)
- PasswordField: Paint caps lock icon on left side in right-to-left component
orientation.
- Window decorations: Window title bar width is no longer considered when - Window decorations: Window title bar width is no longer considered when
calculating preferred/minimum width of window. (issue #351) calculating preferred/minimum width of window. (issue #351)

8
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPasswordFieldUI.java
View File

@@ -177,7 +177,9 @@ public class FlatPasswordFieldUI
JTextComponent c = getComponent(); JTextComponent c = getComponent();
int y = (c.getHeight() - capsLockIcon.getIconHeight()) / 2; int y = (c.getHeight() - capsLockIcon.getIconHeight()) / 2;
int x = c.getWidth() - capsLockIcon.getIconWidth() - y; int x = c.getComponentOrientation().isLeftToRight()
? c.getWidth() - capsLockIcon.getIconWidth() - y
: y;
capsLockIcon.paintIcon( c, g, x, y ); capsLockIcon.paintIcon( c, g, x, y );
} }
@@ -202,6 +204,8 @@ public class FlatPasswordFieldUI
if( !isCapsLockVisible() ) if( !isCapsLockVisible() )
return padding; return padding;
return FlatUIUtils.addInsets( padding, new Insets( 0, 0, 0, capsLockIcon.getIconWidth() ) ); boolean ltr = getComponent().getComponentOrientation().isLeftToRight();
int iconWidth = capsLockIcon.getIconWidth();
return FlatUIUtils.addInsets( padding, new Insets( 0, ltr ? 0 : iconWidth, 0, ltr ? iconWidth : 0 ) );
} }
} }