MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Ensure we initialize default theme name in static fields

Browse Source
This commit is contained in:
Vassiliy.Kudryashov
2018-03-06 21:39:04 +03:00
parent ccab6a3a3d
commit 8ae30a1a56
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/customize/CustomizeUIThemeStepPanel.java
+5 -5
View File
@@ -66,7 +66,6 @@ public class CustomizeUIThemeStepPanel extends AbstractCustomizeWizardStep {
LafManagerImpl.useIntelliJInsteadOfAqua() ? "Light" : "IntelliJ", "IntelliJ", IntelliJLaf.class.getName());
protected static final ThemeInfo GTK = new ThemeInfo("GTK+", "GTK", "com.sun.java.swing.plaf.gtk.GTKLookAndFeel");
private boolean myInitial = true;
private final boolean myColumnMode;
private final JLabel myPreviewLabel;
private final Set<ThemeInfo> myThemes = new LinkedHashSet<>();
@@ -112,8 +111,11 @@ public class CustomizeUIThemeStepPanel extends AbstractCustomizeWizardStep {
wrapperPanel.add(myPreviewLabel);
add(wrapperPanel, BorderLayout.CENTER);
}
//Static fields initialization. At this point there is no parent window
applyLaf(myDefaultTheme, this);
//Actual UI initialization
//noinspection SSBasedInspection
SwingUtilities.invokeLater(() -> applyLaf(myDefaultTheme, this));
myInitial = false;
}
protected void initThemes(Collection<ThemeInfo> result) {
@@ -190,9 +192,7 @@ public class CustomizeUIThemeStepPanel extends AbstractCustomizeWizardStep {
UIManager.setLookAndFeel(info.getClassName());
LafManagerImpl.updateForDarcula(UIUtil.isUnderDarcula());
String className = info.getClassName();
if (!myInitial) {
WelcomeWizardUtil.setWizardLAF(className);
}
WelcomeWizardUtil.setWizardLAF(className);
Window window = SwingUtilities.getWindowAncestor(component);
if (window != null) {
if (SystemInfo.isMac) {