Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-08 15:00:54 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

renamed FlatLaf.initColorPalette() to initIconColors()

Browse Source
This commit is contained in:
Karl Tauber
2019-11-26 11:06:13 +01:00
parent 900d005d89
commit 879a8aaa6d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
View File

@@ -204,7 +204,7 @@ public abstract class FlatLaf
Object aquaMenuBarUI = useScreenMenuBar ? defaults.get( "MenuBarUI" ) : null; Object aquaMenuBarUI = useScreenMenuBar ? defaults.get( "MenuBarUI" ) : null;
initFonts( defaults ); initFonts( defaults );
initColorPalette( defaults, isDark() ); initIconColors( defaults, isDark() );
// load defaults from properties // load defaults from properties
List<Class<?>> lafClassesForDefaultsLoading = getLafClassesForDefaultsLoading(); List<Class<?>> lafClassesForDefaultsLoading = getLafClassesForDefaultsLoading();
@@ -265,7 +265,7 @@ public abstract class FlatLaf
* <p> * <p>
* This method is public and static to allow using the color palette with * This method is public and static to allow using the color palette with
* other LaFs (e.g. Windows LaF). To do so invoke: * other LaFs (e.g. Windows LaF). To do so invoke:
* {@code FlatLaf.initColorPalette( UIManager.getLookAndFeelDefaults(), false );} * {@code FlatLaf.initIconColors( UIManager.getLookAndFeelDefaults(), false );}
* after * after
* {@code UIManager.setLookAndFeel( ... );}. * {@code UIManager.setLookAndFeel( ... );}.
* <p> * <p>
@@ -274,8 +274,8 @@ public abstract class FlatLaf
* and * and
* <a href="https://jetbrains.design/intellij/principles/icons/#noun-icons">Noun icons</a> * <a href="https://jetbrains.design/intellij/principles/icons/#noun-icons">Noun icons</a>
*/ */
public static void initColorPalette( UIDefaults defaults, boolean dark ) { public static void initIconColors( UIDefaults defaults, boolean dark ) {
// colors for actions // colors for action icons
// see https://jetbrains.design/intellij/principles/icons/#action-icons // see https://jetbrains.design/intellij/principles/icons/#action-icons
defaults.put( "Actions.Red", new ColorUIResource( !dark ? 0xDB5860 : 0xC75450 ) ); defaults.put( "Actions.Red", new ColorUIResource( !dark ? 0xDB5860 : 0xC75450 ) );
defaults.put( "Actions.Yellow", new ColorUIResource( !dark ? 0xEDA200 : 0xF0A732 ) ); defaults.put( "Actions.Yellow", new ColorUIResource( !dark ? 0xEDA200 : 0xF0A732 ) );
@@ -284,7 +284,7 @@ public abstract class FlatLaf
defaults.put( "Actions.Grey", new ColorUIResource( !dark ? 0x6E6E6E : 0xAFB1B3 ) ); defaults.put( "Actions.Grey", new ColorUIResource( !dark ? 0x6E6E6E : 0xAFB1B3 ) );
defaults.put( "Actions.GreyInline", new ColorUIResource( !dark ? 0x7F8B91 : 0x7F8B91 ) ); defaults.put( "Actions.GreyInline", new ColorUIResource( !dark ? 0x7F8B91 : 0x7F8B91 ) );
// colors for objects // colors for object icons
// see https://jetbrains.design/intellij/principles/icons/#noun-icons // see https://jetbrains.design/intellij/principles/icons/#noun-icons
defaults.put( "Objects.Grey", new ColorUIResource( 0x9AA7B0 ) ); defaults.put( "Objects.Grey", new ColorUIResource( 0x9AA7B0 ) );
defaults.put( "Objects.Blue", new ColorUIResource( 0x40B6E0 ) ); defaults.put( "Objects.Blue", new ColorUIResource( 0x40B6E0 ) );