Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added app/lib/flatlaf-0.27.jar
Binary file not shown.
11 changes: 10 additions & 1 deletion app/src/processing/app/Base.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@
import processing.app.syntax.SketchTextAreaDefaultInputMap;
import processing.app.tools.MenuScroller;
import processing.app.tools.ZipDeflater;
import com.formdev.flatlaf.FlatLightLaf;
import com.formdev.flatlaf.FlatDarkLaf;

import javax.swing.*;
import java.awt.*;
Expand Down Expand Up @@ -245,12 +247,19 @@ public Base(String[] args) throws Exception {
Theme.init();
System.setProperty("swing.aatext", PreferencesData.get("editor.antialias", "true"));

// Set the look and feel before opening the window
try {
UIManager.setLookAndFeel( new FlatLightLaf() );
} catch( Exception ex ) {
System.err.println( "Failed to initialize LaF" );
}

/*
try {
BaseNoGui.getPlatform().setLookAndFeel();
} catch (Exception e) {
// ignore
}
*/

// Use native popups so they don't look so crappy on osx
JPopupMenu.setDefaultLightWeightPopupEnabled(false);
Expand Down
1 change: 1 addition & 0 deletions build/windows/launcher/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
<cp>%EXEDIR%/lib/commons-logging-1.0.4.jar</cp>
<cp>%EXEDIR%/lib/commons-net-3.3.jar</cp>
<cp>%EXEDIR%/lib/commons-io-2.6.jar</cp>
<cp>%EXEDIR%/lib/flatlaf-0.27.jar</cp>
<cp>%EXEDIR%/lib/jackson-annotations-2.9.5.jar</cp>
<cp>%EXEDIR%/lib/jackson-core-2.9.5.jar</cp>
<cp>%EXEDIR%/lib/jackson-databind-2.9.5.jar</cp>
Expand Down
1 change: 1 addition & 0 deletions build/windows/launcher/config_debug.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
<cp>%EXEDIR%/lib/commons-logging-1.0.4.jar</cp>
<cp>%EXEDIR%/lib/commons-net-3.3.jar</cp>
<cp>%EXEDIR%/lib/commons-io-2.6.jar</cp>
<cp>%EXEDIR%/lib/flatlaf-0.27.jar</cp>
<cp>%EXEDIR%/lib/jackson-annotations-2.9.5.jar</cp>
<cp>%EXEDIR%/lib/jackson-core-2.9.5.jar</cp>
<cp>%EXEDIR%/lib/jackson-databind-2.9.5.jar</cp>
Expand Down