From 4ac5ad06f2747838681b7a963add43753d451c34 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Fri, 27 Mar 2020 18:54:30 +0100 Subject: [PATCH] IntelliJ Themes: simplified applying theme properties to UI defaults --- .../src/main/java/com/formdev/flatlaf/FlatLaf.java | 12 +++++++----- .../main/java/com/formdev/flatlaf/IntelliJTheme.java | 9 +-------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java index c02ec1e1..55a8f087 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java @@ -280,16 +280,18 @@ public abstract class FlatLaf // initialize text antialiasing putAATextInfo( defaults ); - invokePostInitialization( defaults ); + // apply additional defaults (e.g. from IntelliJ themes) + applyAdditionalDefaults( defaults ); - return defaults; - } - - void invokePostInitialization( UIDefaults defaults ) { if( postInitialization != null ) { postInitialization.accept( defaults ); postInitialization = null; } + + return defaults; + } + + void applyAdditionalDefaults( UIDefaults defaults ) { } List> getLafClassesForDefaultsLoading() { diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java index 33f7dfdc..c0304f4b 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java @@ -513,15 +513,8 @@ public class IntelliJTheme } @Override - public UIDefaults getDefaults() { - UIDefaults defaults = super.getDefaults(); + void applyAdditionalDefaults( UIDefaults defaults ) { theme.applyProperties( defaults ); - super.invokePostInitialization( defaults ); - return defaults; - } - - @Override - void invokePostInitialization( UIDefaults defaults ) { } @Override