From bb560e181bc9049dceca7018198668cacab825e8 Mon Sep 17 00:00:00 2001 From: Simon Date: Sat, 17 Feb 2024 00:25:55 +0100 Subject: [PATCH 1/2] Make FlatLaf Dark the default LaF --- megameklab/src/megameklab/util/CConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/megameklab/src/megameklab/util/CConfig.java b/megameklab/src/megameklab/util/CConfig.java index 1d884480b..11515174e 100644 --- a/megameklab/src/megameklab/util/CConfig.java +++ b/megameklab/src/megameklab/util/CConfig.java @@ -118,6 +118,7 @@ public final class CConfig { */ private static Properties getDefaults() { Properties defaults = new Properties(); + defaults.setProperty(GUI_PLAF, "com.formdev.flatlaf.FlatDarkLaf"); defaults.setProperty(GUI_FULLSCREEN, Boolean.toString(false)); defaults.setProperty(MISC_SUMMARY_FORMAT_TRO, Boolean.toString(true)); defaults.setProperty(MISC_SKIP_SAFETY_PROMPTS, Boolean.toString(false)); From 643a26d220368c9510437181dc9ef8735803c712 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 27 Feb 2024 18:18:08 +0100 Subject: [PATCH 2/2] Set FlatLaf Darcula as the default LaF and restrict Laf to Flat ... and the system default --- megameklab/src/megameklab/ui/MenuBar.java | 4 ++++ megameklab/src/megameklab/util/CConfig.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/megameklab/src/megameklab/ui/MenuBar.java b/megameklab/src/megameklab/ui/MenuBar.java index 832cd34b9..126231515 100644 --- a/megameklab/src/megameklab/ui/MenuBar.java +++ b/megameklab/src/megameklab/ui/MenuBar.java @@ -17,6 +17,7 @@ import megamek.client.ui.dialogs.BVDisplayDialog; import megamek.client.ui.dialogs.CostDisplayDialog; import megamek.client.ui.dialogs.WeightDisplayDialog; +import megamek.client.ui.swing.GUIPreferences; import megamek.client.ui.swing.UnitLoadingDialog; import megamek.common.*; import megamek.common.annotations.Nullable; @@ -595,6 +596,9 @@ private JMenu createThemesMenu() { themesMenu.setMnemonic(KeyEvent.VK_T); for (final LookAndFeelInfo laf : UIManager.getInstalledLookAndFeels()) { + if (!GUIPreferences.isSupportedLookAndFeel(laf)) { + continue; + } final JCheckBoxMenuItem miLookAndFeel = new JCheckBoxMenuItem(laf.getName()); miLookAndFeel.setName("miLookAndFeel"); miLookAndFeel.setSelected(laf.getName().equalsIgnoreCase(UIManager.getLookAndFeel().getName())); diff --git a/megameklab/src/megameklab/util/CConfig.java b/megameklab/src/megameklab/util/CConfig.java index 11515174e..35ff6dc38 100644 --- a/megameklab/src/megameklab/util/CConfig.java +++ b/megameklab/src/megameklab/util/CConfig.java @@ -118,7 +118,7 @@ public final class CConfig { */ private static Properties getDefaults() { Properties defaults = new Properties(); - defaults.setProperty(GUI_PLAF, "com.formdev.flatlaf.FlatDarkLaf"); + defaults.setProperty(GUI_PLAF, "com.formdev.flatlaf.FlatDarculaLaf"); defaults.setProperty(GUI_FULLSCREEN, Boolean.toString(false)); defaults.setProperty(MISC_SUMMARY_FORMAT_TRO, Boolean.toString(true)); defaults.setProperty(MISC_SKIP_SAFETY_PROMPTS, Boolean.toString(false));