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

PasswordField: support disabling Caps Lock warning icon (issue #172)

Browse Source
This commit is contained in:
Karl Tauber
2020-09-17 15:34:57 +02:00
parent 5444719895
commit a53ce99977
7 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -14,6 +14,7 @@ FlatLaf Change Log
current theme (look and feel). current theme (look and feel).
- Made disabled text color slightly lighter in dark themes for better - Made disabled text color slightly lighter in dark themes for better
readability. (issue #174) readability. (issue #174)
- PasswordField: Support disabling Caps Lock warning icon. (issue #172)
#### Fixed bugs #### Fixed bugs

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

@@ -60,6 +60,7 @@ import com.formdev.flatlaf.util.HiDPIUtils;
* @uiDefault Component.minimumWidth int * @uiDefault Component.minimumWidth int
* @uiDefault Component.isIntelliJTheme boolean * @uiDefault Component.isIntelliJTheme boolean
* @uiDefault PasswordField.placeholderForeground Color * @uiDefault PasswordField.placeholderForeground Color
* @uiDefault PasswordField.showCapsLock boolean
* @uiDefault PasswordField.capsLockIcon Icon * @uiDefault PasswordField.capsLockIcon Icon
* @uiDefault TextComponent.selectAllOnFocusPolicy String never, once (default) or always * @uiDefault TextComponent.selectAllOnFocusPolicy String never, once (default) or always
* *
@@ -71,6 +72,7 @@ public class FlatPasswordFieldUI
protected int minimumWidth; protected int minimumWidth;
protected boolean isIntelliJTheme; protected boolean isIntelliJTheme;
protected Color placeholderForeground; protected Color placeholderForeground;
protected boolean showCapsLock;
protected Icon capsLockIcon; protected Icon capsLockIcon;
private FocusListener focusListener; private FocusListener focusListener;
@@ -88,6 +90,7 @@ public class FlatPasswordFieldUI
minimumWidth = UIManager.getInt( "Component.minimumWidth" ); minimumWidth = UIManager.getInt( "Component.minimumWidth" );
isIntelliJTheme = UIManager.getBoolean( "Component.isIntelliJTheme" ); isIntelliJTheme = UIManager.getBoolean( "Component.isIntelliJTheme" );
placeholderForeground = UIManager.getColor( prefix + ".placeholderForeground" ); placeholderForeground = UIManager.getColor( prefix + ".placeholderForeground" );
showCapsLock = UIManager.getBoolean( "PasswordField.showCapsLock" );
capsLockIcon = UIManager.getIcon( "PasswordField.capsLockIcon" ); capsLockIcon = UIManager.getIcon( "PasswordField.capsLockIcon" );
LookAndFeel.installProperty( getComponent(), "opaque", false ); LookAndFeel.installProperty( getComponent(), "opaque", false );
@@ -160,6 +163,9 @@ public class FlatPasswordFieldUI
} }
protected void paintCapsLock( Graphics g ) { protected void paintCapsLock( Graphics g ) {
if( !showCapsLock )
return;
JTextComponent c = getComponent(); JTextComponent c = getComponent();
if( !FlatUIUtils.isPermanentFocusOwner( c ) || if( !FlatUIUtils.isPermanentFocusOwner( c ) ||
!Toolkit.getDefaultToolkit().getLockingKeyState( KeyEvent.VK_CAPS_LOCK ) ) !Toolkit.getDefaultToolkit().getLockingKeyState( KeyEvent.VK_CAPS_LOCK ) )

1
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
View File

@@ -393,6 +393,7 @@ PasswordField.margin=@textComponentMargin
PasswordField.background=@textComponentBackground PasswordField.background=@textComponentBackground
PasswordField.placeholderForeground=@disabledText PasswordField.placeholderForeground=@disabledText
PasswordField.echoChar=\u2022 PasswordField.echoChar=\u2022
PasswordField.showCapsLock=true
PasswordField.capsLockIcon=com.formdev.flatlaf.icons.FlatCapsLockIcon PasswordField.capsLockIcon=com.formdev.flatlaf.icons.FlatCapsLockIcon

1
flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt
View File

@@ -652,6 +652,7 @@ PasswordField.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI]
PasswordField.placeholderForeground #888888 javax.swing.plaf.ColorUIResource [UI] PasswordField.placeholderForeground #888888 javax.swing.plaf.ColorUIResource [UI]
PasswordField.selectionBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI] PasswordField.selectionBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI]
PasswordField.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] PasswordField.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
PasswordField.showCapsLock true
PasswordFieldUI com.formdev.flatlaf.ui.FlatPasswordFieldUI PasswordFieldUI com.formdev.flatlaf.ui.FlatPasswordFieldUI

1
flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt
View File

@@ -657,6 +657,7 @@ PasswordField.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI]
PasswordField.placeholderForeground #8c8c8c javax.swing.plaf.ColorUIResource [UI] PasswordField.placeholderForeground #8c8c8c javax.swing.plaf.ColorUIResource [UI]
PasswordField.selectionBackground #2675bf javax.swing.plaf.ColorUIResource [UI] PasswordField.selectionBackground #2675bf javax.swing.plaf.ColorUIResource [UI]
PasswordField.selectionForeground #ffffff javax.swing.plaf.ColorUIResource [UI] PasswordField.selectionForeground #ffffff javax.swing.plaf.ColorUIResource [UI]
PasswordField.showCapsLock true
PasswordFieldUI com.formdev.flatlaf.ui.FlatPasswordFieldUI PasswordFieldUI com.formdev.flatlaf.ui.FlatPasswordFieldUI

1
flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatTestLaf_1.8.0_202.txt
View File

@@ -649,6 +649,7 @@ PasswordField.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI]
PasswordField.placeholderForeground #000088 javax.swing.plaf.ColorUIResource [UI] PasswordField.placeholderForeground #000088 javax.swing.plaf.ColorUIResource [UI]
PasswordField.selectionBackground #00aa00 javax.swing.plaf.ColorUIResource [UI] PasswordField.selectionBackground #00aa00 javax.swing.plaf.ColorUIResource [UI]
PasswordField.selectionForeground #ffff00 javax.swing.plaf.ColorUIResource [UI] PasswordField.selectionForeground #ffff00 javax.swing.plaf.ColorUIResource [UI]
PasswordField.showCapsLock true
PasswordFieldUI com.formdev.flatlaf.ui.FlatPasswordFieldUI PasswordFieldUI com.formdev.flatlaf.ui.FlatPasswordFieldUI

1
flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt
View File

@@ -452,6 +452,7 @@ PasswordField.margin
PasswordField.placeholderForeground PasswordField.placeholderForeground
PasswordField.selectionBackground PasswordField.selectionBackground
PasswordField.selectionForeground PasswordField.selectionForeground
PasswordField.showCapsLock
PasswordFieldUI PasswordFieldUI
Popup.dropShadowColor Popup.dropShadowColor
Popup.dropShadowInsets Popup.dropShadowInsets