rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-26 20:54:22 +01:00
Code Issues Releases Activity

Merge bfb5a9903399cd8338bb3109ad66ca4a5dc3af6e into 3278173ef810935e07808deed58783c1bc7ca4cf

Browse Source
This commit is contained in:
Martino Facchin 2024-11-28 04:19:31 +01:00 committed by GitHub
commit 4b2f30f137
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/lib/flatlaf-0.27.jar Normal file
View File

Binary file not shown.

11
app/src/processing/app/Base.java
View File

@ -61,6 +61,8 @@ import processing.app.syntax.PdeKeywords;
import processing.app.syntax.SketchTextAreaDefaultInputMap; import processing.app.syntax.SketchTextAreaDefaultInputMap;
import processing.app.tools.MenuScroller; import processing.app.tools.MenuScroller;
import processing.app.tools.ZipDeflater; import processing.app.tools.ZipDeflater;
import com.formdev.flatlaf.FlatLightLaf;
import com.formdev.flatlaf.FlatDarkLaf;
import javax.swing.*; import javax.swing.*;
import java.awt.*; import java.awt.*;
@ -244,12 +246,19 @@ public class Base {
Theme.init(); Theme.init();
System.setProperty("swing.aatext", PreferencesData.get("editor.antialias", "true")); 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 { try {
BaseNoGui.getPlatform().setLookAndFeel(); BaseNoGui.getPlatform().setLookAndFeel();
} catch (Exception e) { } catch (Exception e) {
// ignore // ignore
} }
*/
// Use native popups so they don't look so crappy on osx // Use native popups so they don't look so crappy on osx
JPopupMenu.setDefaultLightWeightPopupEnabled(false); JPopupMenu.setDefaultLightWeightPopupEnabled(false);

1
build/windows/launcher/config.xml
View File

@ -37,6 +37,7 @@
<cp>%EXEDIR%/lib/commons-logging-1.0.4.jar</cp> <cp>%EXEDIR%/lib/commons-logging-1.0.4.jar</cp>
<cp>%EXEDIR%/lib/commons-net-3.3.jar</cp> <cp>%EXEDIR%/lib/commons-net-3.3.jar</cp>
<cp>%EXEDIR%/lib/commons-io-2.6.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-annotations-2.9.5.jar</cp>
<cp>%EXEDIR%/lib/jackson-core-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> <cp>%EXEDIR%/lib/jackson-databind-2.9.5.jar</cp>

1
build/windows/launcher/config_debug.xml
View File

@ -37,6 +37,7 @@
<cp>%EXEDIR%/lib/commons-logging-1.0.4.jar</cp> <cp>%EXEDIR%/lib/commons-logging-1.0.4.jar</cp>
<cp>%EXEDIR%/lib/commons-net-3.3.jar</cp> <cp>%EXEDIR%/lib/commons-net-3.3.jar</cp>
<cp>%EXEDIR%/lib/commons-io-2.6.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-annotations-2.9.5.jar</cp>
<cp>%EXEDIR%/lib/jackson-core-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> <cp>%EXEDIR%/lib/jackson-databind-2.9.5.jar</cp>