Skip to content

Commit b73bc92

Browse files
committed
Moving some other graphic related parts into GUI initialization
1 parent cf54cce commit b73bc92

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

app/src/processing/app/Base.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,23 @@ public Base(String[] args) throws Exception {
202202

203203
SplashScreenHelper splash;
204204
if (parser.isGuiMode()) {
205+
// Setup all notification widgets
205206
splash = new SplashScreenHelper(SplashScreen.getSplashScreen());
207+
BaseNoGui.notifier = new GUIUserNotifier(this);
208+
209+
// Setup the theme coloring fun
210+
Theme.init();
211+
System.setProperty("swing.aatext", PreferencesData.get("editor.antialias", "true"));
212+
213+
// Set the look and feel before opening the window
214+
try {
215+
BaseNoGui.getPlatform().setLookAndFeel();
216+
} catch (Exception e) {
217+
// ignore
218+
}
219+
220+
// Use native popups so they don't look so crappy on osx
221+
JPopupMenu.setDefaultLightWeightPopupEnabled(false);
206222
} else {
207223
splash = new SplashScreenHelper(null);
208224
}
@@ -211,29 +227,13 @@ public Base(String[] args) throws Exception {
211227

212228
BaseNoGui.initVersion();
213229

214-
// Use native popups so they don't look so crappy on osx
215-
JPopupMenu.setDefaultLightWeightPopupEnabled(false);
216-
217230
// Don't put anything above this line that might make GUI,
218231
// because the platform has to be inited properly first.
219232

220-
// setup the theme coloring fun
221-
Theme.init();
222-
System.setProperty("swing.aatext", PreferencesData.get("editor.antialias", "true"));
223-
224-
// Set the look and feel before opening the window
225-
try {
226-
BaseNoGui.getPlatform().setLookAndFeel();
227-
} catch (Exception e) {
228-
// ignore
229-
}
230-
231233
// Create a location for untitled sketches
232234
untitledFolder = FileUtils.createTempFolder("untitled" + new Random().nextInt(Integer.MAX_VALUE), ".tmp");
233235
DeleteFilesOnShutdown.add(untitledFolder);
234236

235-
BaseNoGui.notifier = new GUIUserNotifier(this);
236-
237237
BaseNoGui.checkInstallationFolder();
238238

239239
// If no path is set, get the default sketchbook folder for this platform

0 commit comments

Comments
 (0)