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 e535daf6..f40db140 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java @@ -113,6 +113,14 @@ public abstract class FlatLaf public abstract boolean isDark(); + /** + * Checks whether the current look and feel is dark. + */ + public static boolean isLafDark() { + LookAndFeel lookAndFeel = UIManager.getLookAndFeel(); + return lookAndFeel instanceof FlatLaf && ((FlatLaf)lookAndFeel).isDark(); + } + /** * Returns whether FlatLaf supports custom window decorations. * This depends on the operating system and on the used Java runtime. diff --git a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java index f343b51a..ca354603 100644 --- a/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java +++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java @@ -29,7 +29,6 @@ import java.net.URL; import java.util.HashMap; import java.util.Map; import javax.swing.Icon; -import javax.swing.LookAndFeel; import javax.swing.UIManager; import com.formdev.flatlaf.FlatIconColors; import com.formdev.flatlaf.FlatLaf; @@ -164,8 +163,7 @@ public class FlatSVGIcon } private static void lafChanged() { - LookAndFeel lookAndFeel = UIManager.getLookAndFeel(); - darkLaf = (lookAndFeel instanceof FlatLaf && ((FlatLaf)lookAndFeel).isDark()); + darkLaf = FlatLaf.isLafDark(); } //---- class ColorFilter -------------------------------------------------- diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatDisabledIconsTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatDisabledIconsTest.java index e375530d..95e960b2 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatDisabledIconsTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatDisabledIconsTest.java @@ -598,12 +598,7 @@ public class FlatDisabledIconsTest } private ImageIcon getCurrentIcon() { - return isDark() ? darkIcon : lightIcon; - } - - private boolean isDark() { - LookAndFeel lookAndFeel = UIManager.getLookAndFeel(); - return lookAndFeel instanceof FlatLaf && ((FlatLaf)lookAndFeel).isDark(); + return FlatLaf.isLafDark() ? darkIcon : lightIcon; } @Override diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java index aa9b8087..4b7407e4 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java @@ -399,8 +399,7 @@ public class FlatTestFrame boolean explicit = explicitColorsCheckBox.isSelected(); ColorUIResource restoreColor = new ColorUIResource( Color.white ); - LookAndFeel lookAndFeel = UIManager.getLookAndFeel(); - boolean dark = (lookAndFeel instanceof FlatLaf && ((FlatLaf)lookAndFeel).isDark()); + boolean dark = FlatLaf.isLafDark(); Color magenta = dark ? Color.magenta.darker() : Color.magenta; Color orange = dark ? Color.orange.darker() : Color.orange; Color blue = dark ? Color.blue.darker() : Color.blue;