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

TextField: require JComponent for leading and trailing components (to allow setting a style class client property)

Browse Source
This commit is contained in:
Karl Tauber
2021-12-12 00:42:15 +01:00
parent f93d035e4e
commit 51be7ad832
5 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
flatlaf-core/src/main/java/com/formdev/flatlaf/FlatClientProperties.java
View File

@@ -877,7 +877,7 @@ public interface FlatClientProperties
* (see {@link #OUTLINE}.
* <p>
* <strong>Component</strong> {@link javax.swing.JTextField} (and subclasses)<br>
* <strong>Value type</strong> {@link java.awt.Component}
* <strong>Value type</strong> {@link javax.swing.JComponent}
*
* @since 2
*/
@@ -897,7 +897,7 @@ public interface FlatClientProperties
* (see {@link #OUTLINE}.
* <p>
* <strong>Component</strong> {@link javax.swing.JTextField} (and subclasses)<br>
* <strong>Value type</strong> {@link java.awt.Component}
* <strong>Value type</strong> {@link javax.swing.JComponent}
*
* @since 2
*/

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

@@ -97,8 +97,8 @@ public class FlatTextFieldUI
/** @since 2 */ @Styleable protected Icon leadingIcon;
/** @since 2 */ @Styleable protected Icon trailingIcon;
/** @since 2 */ protected Component leadingComponent;
/** @since 2 */ protected Component trailingComponent;
/** @since 2 */ protected JComponent leadingComponent;
/** @since 2 */ protected JComponent trailingComponent;
private Color oldDisabledBackground;
private Color oldInactiveBackground;
@@ -554,8 +554,8 @@ debug*/
boolean ltr = isLeftToRight();
// remove width of leading/trailing components
Component leftComponent = ltr ? leadingComponent : trailingComponent;
Component rightComponent = ltr ? trailingComponent : leadingComponent;
JComponent leftComponent = ltr ? leadingComponent : trailingComponent;
JComponent rightComponent = ltr ? trailingComponent : leadingComponent;
if( leftComponent != null ) {
int w = leftComponent.getPreferredSize().width;
r.x += w;
@@ -634,7 +634,7 @@ debug*/
/** @since 2 */
protected void installLeadingComponent() {
JTextComponent c = getComponent();
leadingComponent = clientProperty( c, TEXT_FIELD_LEADING_COMPONENT, null, Component.class );
leadingComponent = clientProperty( c, TEXT_FIELD_LEADING_COMPONENT, null, JComponent.class );
if( leadingComponent != null ) {
installLayout();
c.add( leadingComponent );
@@ -644,7 +644,7 @@ debug*/
/** @since 2 */
protected void installTrailingComponent() {
JTextComponent c = getComponent();
trailingComponent = clientProperty( c, TEXT_FIELD_TRAILING_COMPONENT, null, Component.class );
trailingComponent = clientProperty( c, TEXT_FIELD_TRAILING_COMPONENT, null, JComponent.class );
if( trailingComponent != null ) {
installLayout();
c.add( trailingComponent );
@@ -718,8 +718,8 @@ debug*/
int ow = FlatUIUtils.getBorderFocusAndLineWidth( getComponent() );
int h = parent.getHeight() - ow - ow;
boolean ltr = isLeftToRight();
Component leftComponent = ltr ? leadingComponent : trailingComponent;
Component rightComponent = ltr ? trailingComponent : leadingComponent;
JComponent leftComponent = ltr ? leadingComponent : trailingComponent;
JComponent rightComponent = ltr ? trailingComponent : leadingComponent;
// layout left component
if( leftComponent != null && leftComponent.isVisible() ) {