From fde65b273011ee19b17c2e29c7395f1f8ab63c27 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Tue, 20 Jun 2023 23:45:41 +0200 Subject: [PATCH] Styling: fixed scaling of some styling properties (`rowHeight` for Table and Tree; `iconTextGap` for Button, CheckBox and RadioButton) (issue #682) --- CHANGELOG.md | 2 ++ .../src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java | 3 +++ .../main/java/com/formdev/flatlaf/ui/FlatRadioButtonUI.java | 3 +++ .../src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java | 3 +++ .../src/main/java/com/formdev/flatlaf/ui/FlatTreeUI.java | 3 +++ 5 files changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83635419..76287cd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ FlatLaf Change Log #### Fixed bugs +- Styling: Fixed scaling of some styling properties (`rowHeight` for Table and + Tree; `iconTextGap` for Button, CheckBox and RadioButton). (issue #682) - Fixed `IllegalComponentStateException` when invoker is not showing in `SubMenuUsabilityHelper`. (issue #692) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java index 8cf558b0..7fd679b3 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java @@ -362,6 +362,9 @@ public class FlatButtonUI return ((FlatHelpButtonIcon)helpButtonIcon).applyStyleProperty( key, value ); } + if( "iconTextGap".equals( key ) && value instanceof Integer ) + value = UIScale.scale( (Integer) value ); + if( borderShared == null ) borderShared = new AtomicBoolean( true ); return FlatStylingSupport.applyToAnnotatedObjectOrBorder( this, key, value, b, borderShared ); diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonUI.java index 119c08bc..860676e0 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonUI.java @@ -208,6 +208,9 @@ public class FlatRadioButtonUI return ((FlatCheckBoxIcon)icon).applyStyleProperty( key, value ); } + if( "iconTextGap".equals( key ) && value instanceof Integer ) + value = UIScale.scale( (Integer) value ); + return FlatStylingSupport.applyToAnnotatedObjectOrComponent( this, b, key, value ); } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java index 80465d09..9811d292 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTableUI.java @@ -277,6 +277,9 @@ public class FlatTableUI /** @since 2 */ protected Object applyStyleProperty( String key, Object value ) { + if( "rowHeight".equals( key ) && value instanceof Integer ) + value = UIScale.scale( (Integer) value ); + return FlatStylingSupport.applyToAnnotatedObjectOrComponent( this, table, key, value ); } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTreeUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTreeUI.java index b585647a..31d898e2 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTreeUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTreeUI.java @@ -420,6 +420,9 @@ public class FlatTreeUI /** @since 2 */ protected Object applyStyleProperty( String key, Object value ) { + if( "rowHeight".equals( key ) && value instanceof Integer ) + value = UIScale.scale( (Integer) value ); + return FlatStylingSupport.applyToAnnotatedObjectOrComponent( this, tree, key, value ); }