From 52702b52671d6caf5d1a165cb747825e526267dc Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Tue, 18 Feb 2020 14:32:15 +0100 Subject: [PATCH] ColorChooser: use scaled dimension instead of temporary modifying UI defaults --- .../flatlaf/ui/FlatColorChooserUI.java | 20 ------------------- .../com/formdev/flatlaf/FlatLaf.properties | 4 ++-- .../uidefaults/FlatDarkLaf_1.8.0_202-mac.txt | 4 ++-- .../uidefaults/FlatDarkLaf_1.8.0_202.txt | 4 ++-- .../uidefaults/FlatLightLaf_1.8.0_202-mac.txt | 4 ++-- .../uidefaults/FlatLightLaf_1.8.0_202.txt | 4 ++-- 6 files changed, 10 insertions(+), 30 deletions(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatColorChooserUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatColorChooserUI.java index 29942fae..bb17001c 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatColorChooserUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatColorChooserUI.java @@ -16,12 +16,9 @@ package com.formdev.flatlaf.ui; -import java.awt.Dimension; import javax.swing.JComponent; -import javax.swing.UIManager; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicColorChooserUI; -import com.formdev.flatlaf.util.UIScale; /** * Provides the Flat LaF UI delegate for {@link javax.swing.JColorChooser}. @@ -43,21 +40,4 @@ public class FlatColorChooserUI public static ComponentUI createUI( JComponent c ) { return new FlatColorChooserUI(); } - - @Override - public void installUI( JComponent c ) { - if( UIScale.getUserScaleFactor() != 1f ) { - // temporary scale swatch sizes - Dimension swatchSize = UIManager.getDimension( "ColorChooser.swatchesSwatchSize" ); - Dimension swatchSize2 = UIManager.getDimension( "ColorChooser.swatchesRecentSwatchSize" ); - UIManager.put( "ColorChooser.swatchesSwatchSize", UIScale.scale( swatchSize ) ); - UIManager.put( "ColorChooser.swatchesRecentSwatchSize", UIScale.scale( swatchSize2 ) ); - - super.installUI( c ); - - UIManager.put( "ColorChooser.swatchesSwatchSize", null ); - UIManager.put( "ColorChooser.swatchesRecentSwatchSize", null ); - } else - super.installUI( c ); - } } diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties index a21b1ff3..a39e435b 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties @@ -169,8 +169,8 @@ CheckBoxMenuItem.background=@menuBackground #---- ColorChooser ---- -ColorChooser.swatchesSwatchSize=16,16 -ColorChooser.swatchesRecentSwatchSize=16,16 +ColorChooser.swatchesSwatchSize={scaledDimension}16,16 +ColorChooser.swatchesRecentSwatchSize={scaledDimension}16,16 ColorChooser.swatchesDefaultRecentColor=$control diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt index 0d3055f5..c1e3869d 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt @@ -214,8 +214,8 @@ ColorChooser.sample.textAndMnemonic Sample Text Sample Text ColorChooser.swatches.textAndMnemonic &Swatches ColorChooser.swatchesDefaultRecentColor #3c3f41 javax.swing.plaf.ColorUIResource [UI] ColorChooser.swatchesRecent.textAndMnemonic Recent: -ColorChooser.swatchesRecentSwatchSize 16,16 javax.swing.plaf.DimensionUIResource [UI] -ColorChooser.swatchesSwatchSize 16,16 javax.swing.plaf.DimensionUIResource [UI] +ColorChooser.swatchesRecentSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIResource [UI] +ColorChooser.swatchesSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIResource [UI] ColorChooserUI com.formdev.flatlaf.ui.FlatColorChooserUI diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt index 526746f3..d16332c3 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt @@ -172,8 +172,8 @@ ColorChooser.background #3c3f41 javax.swing.plaf.ColorUIResource [UI] ColorChooser.font Segoe UI plain 12 javax.swing.plaf.FontUIResource [UI] ColorChooser.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] ColorChooser.swatchesDefaultRecentColor #3c3f41 javax.swing.plaf.ColorUIResource [UI] -ColorChooser.swatchesRecentSwatchSize 16,16 javax.swing.plaf.DimensionUIResource [UI] -ColorChooser.swatchesSwatchSize 16,16 javax.swing.plaf.DimensionUIResource [UI] +ColorChooser.swatchesRecentSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIResource [UI] +ColorChooser.swatchesSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIResource [UI] ColorChooserUI com.formdev.flatlaf.ui.FlatColorChooserUI diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt index 6b42bd71..5dfed140 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt @@ -215,8 +215,8 @@ ColorChooser.sample.textAndMnemonic Sample Text Sample Text ColorChooser.swatches.textAndMnemonic &Swatches ColorChooser.swatchesDefaultRecentColor #f2f2f2 javax.swing.plaf.ColorUIResource [UI] ColorChooser.swatchesRecent.textAndMnemonic Recent: -ColorChooser.swatchesRecentSwatchSize 16,16 javax.swing.plaf.DimensionUIResource [UI] -ColorChooser.swatchesSwatchSize 16,16 javax.swing.plaf.DimensionUIResource [UI] +ColorChooser.swatchesRecentSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIResource [UI] +ColorChooser.swatchesSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIResource [UI] ColorChooserUI com.formdev.flatlaf.ui.FlatColorChooserUI diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt index 5a8acd75..19d5b63e 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt @@ -173,8 +173,8 @@ ColorChooser.background #f2f2f2 javax.swing.plaf.ColorUIResource [UI] ColorChooser.font Segoe UI plain 12 javax.swing.plaf.FontUIResource [UI] ColorChooser.foreground #000000 javax.swing.plaf.ColorUIResource [UI] ColorChooser.swatchesDefaultRecentColor #f2f2f2 javax.swing.plaf.ColorUIResource [UI] -ColorChooser.swatchesRecentSwatchSize 16,16 javax.swing.plaf.DimensionUIResource [UI] -ColorChooser.swatchesSwatchSize 16,16 javax.swing.plaf.DimensionUIResource [UI] +ColorChooser.swatchesRecentSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIResource [UI] +ColorChooser.swatchesSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIResource [UI] ColorChooserUI com.formdev.flatlaf.ui.FlatColorChooserUI