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

IntelliJ Themes: simplified applying theme properties to UI defaults

Browse Source
This commit is contained in:
Karl Tauber
2020-03-27 18:54:30 +01:00
parent a3788038bb
commit 4ac5ad06f2
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -280,16 +280,18 @@ public abstract class FlatLaf
// initialize text antialiasing // initialize text antialiasing
putAATextInfo( defaults ); putAATextInfo( defaults );
invokePostInitialization( defaults ); // apply additional defaults (e.g. from IntelliJ themes)
applyAdditionalDefaults( defaults );
return defaults;
}
void invokePostInitialization( UIDefaults defaults ) {
if( postInitialization != null ) { if( postInitialization != null ) {
postInitialization.accept( defaults ); postInitialization.accept( defaults );
postInitialization = null; postInitialization = null;
} }
return defaults;
}
void applyAdditionalDefaults( UIDefaults defaults ) {
} }
List<Class<?>> getLafClassesForDefaultsLoading() { List<Class<?>> getLafClassesForDefaultsLoading() {

9
flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java
View File

@@ -513,15 +513,8 @@ public class IntelliJTheme
} }
@Override @Override
public UIDefaults getDefaults() { void applyAdditionalDefaults( UIDefaults defaults ) {
UIDefaults defaults = super.getDefaults();
theme.applyProperties( defaults ); theme.applyProperties( defaults );
super.invokePostInitialization( defaults );
return defaults;
}
@Override
void invokePostInitialization( UIDefaults defaults ) {
} }
@Override @Override