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

ColorChooser: use scaled dimension instead of temporary modifying UI defaults

Browse Source
This commit is contained in:
Karl Tauber
2020-02-18 14:32:15 +01:00
parent cd144ff067
commit 52702b5267
6 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatColorChooserUI.java
View File

@@ -16,12 +16,9 @@
package com.formdev.flatlaf.ui; package com.formdev.flatlaf.ui;
import java.awt.Dimension;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.UIManager;
import javax.swing.plaf.ComponentUI; import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.basic.BasicColorChooserUI; import javax.swing.plaf.basic.BasicColorChooserUI;
import com.formdev.flatlaf.util.UIScale;
/** /**
* Provides the Flat LaF UI delegate for {@link javax.swing.JColorChooser}. * Provides the Flat LaF UI delegate for {@link javax.swing.JColorChooser}.
@@ -43,21 +40,4 @@ public class FlatColorChooserUI
public static ComponentUI createUI( JComponent c ) { public static ComponentUI createUI( JComponent c ) {
return new FlatColorChooserUI(); 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 );
}
} }

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

@@ -169,8 +169,8 @@ CheckBoxMenuItem.background=@menuBackground
#---- ColorChooser ---- #---- ColorChooser ----
ColorChooser.swatchesSwatchSize=16,16 ColorChooser.swatchesSwatchSize={scaledDimension}16,16
ColorChooser.swatchesRecentSwatchSize=16,16 ColorChooser.swatchesRecentSwatchSize={scaledDimension}16,16
ColorChooser.swatchesDefaultRecentColor=$control ColorChooser.swatchesDefaultRecentColor=$control

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

@@ -214,8 +214,8 @@ ColorChooser.sample.textAndMnemonic Sample Text Sample Text
ColorChooser.swatches.textAndMnemonic &Swatches ColorChooser.swatches.textAndMnemonic &Swatches
ColorChooser.swatchesDefaultRecentColor #3c3f41 javax.swing.plaf.ColorUIResource [UI] ColorChooser.swatchesDefaultRecentColor #3c3f41 javax.swing.plaf.ColorUIResource [UI]
ColorChooser.swatchesRecent.textAndMnemonic Recent: ColorChooser.swatchesRecent.textAndMnemonic Recent:
ColorChooser.swatchesRecentSwatchSize 16,16 javax.swing.plaf.DimensionUIResource [UI] ColorChooser.swatchesRecentSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIResource [UI]
ColorChooser.swatchesSwatchSize 16,16 javax.swing.plaf.DimensionUIResource [UI] ColorChooser.swatchesSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIResource [UI]
ColorChooserUI com.formdev.flatlaf.ui.FlatColorChooserUI ColorChooserUI com.formdev.flatlaf.ui.FlatColorChooserUI

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

@@ -172,8 +172,8 @@ ColorChooser.background #3c3f41 javax.swing.plaf.ColorUIResource [UI]
ColorChooser.font Segoe UI plain 12 javax.swing.plaf.FontUIResource [UI] ColorChooser.font Segoe UI plain 12 javax.swing.plaf.FontUIResource [UI]
ColorChooser.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] ColorChooser.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
ColorChooser.swatchesDefaultRecentColor #3c3f41 javax.swing.plaf.ColorUIResource [UI] ColorChooser.swatchesDefaultRecentColor #3c3f41 javax.swing.plaf.ColorUIResource [UI]
ColorChooser.swatchesRecentSwatchSize 16,16 javax.swing.plaf.DimensionUIResource [UI] ColorChooser.swatchesRecentSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIResource [UI]
ColorChooser.swatchesSwatchSize 16,16 javax.swing.plaf.DimensionUIResource [UI] ColorChooser.swatchesSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIResource [UI]
ColorChooserUI com.formdev.flatlaf.ui.FlatColorChooserUI ColorChooserUI com.formdev.flatlaf.ui.FlatColorChooserUI

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

@@ -215,8 +215,8 @@ ColorChooser.sample.textAndMnemonic Sample Text Sample Text
ColorChooser.swatches.textAndMnemonic &Swatches ColorChooser.swatches.textAndMnemonic &Swatches
ColorChooser.swatchesDefaultRecentColor #f2f2f2 javax.swing.plaf.ColorUIResource [UI] ColorChooser.swatchesDefaultRecentColor #f2f2f2 javax.swing.plaf.ColorUIResource [UI]
ColorChooser.swatchesRecent.textAndMnemonic Recent: ColorChooser.swatchesRecent.textAndMnemonic Recent:
ColorChooser.swatchesRecentSwatchSize 16,16 javax.swing.plaf.DimensionUIResource [UI] ColorChooser.swatchesRecentSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIResource [UI]
ColorChooser.swatchesSwatchSize 16,16 javax.swing.plaf.DimensionUIResource [UI] ColorChooser.swatchesSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIResource [UI]
ColorChooserUI com.formdev.flatlaf.ui.FlatColorChooserUI ColorChooserUI com.formdev.flatlaf.ui.FlatColorChooserUI

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

@@ -173,8 +173,8 @@ ColorChooser.background #f2f2f2 javax.swing.plaf.ColorUIResource [UI]
ColorChooser.font Segoe UI plain 12 javax.swing.plaf.FontUIResource [UI] ColorChooser.font Segoe UI plain 12 javax.swing.plaf.FontUIResource [UI]
ColorChooser.foreground #000000 javax.swing.plaf.ColorUIResource [UI] ColorChooser.foreground #000000 javax.swing.plaf.ColorUIResource [UI]
ColorChooser.swatchesDefaultRecentColor #f2f2f2 javax.swing.plaf.ColorUIResource [UI] ColorChooser.swatchesDefaultRecentColor #f2f2f2 javax.swing.plaf.ColorUIResource [UI]
ColorChooser.swatchesRecentSwatchSize 16,16 javax.swing.plaf.DimensionUIResource [UI] ColorChooser.swatchesRecentSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIResource [UI]
ColorChooser.swatchesSwatchSize 16,16 javax.swing.plaf.DimensionUIResource [UI] ColorChooser.swatchesSwatchSize [active] 16,16 javax.swing.plaf.DimensionUIResource [UI]
ColorChooserUI com.formdev.flatlaf.ui.FlatColorChooserUI ColorChooserUI com.formdev.flatlaf.ui.FlatColorChooserUI