rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Code Issues Releases Activity

Fix LookAndFeel loader

Browse Source 
Fix #8119
Close #8122
This commit is contained in:
Cristian Maglie 2018-10-24 17:28:41 +02:00 committed by Cristian Maglie
parent 52706f56a5
commit 045877094b
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arduino-core/src/processing/app/linux/Platform.java
View File

@ -37,10 +37,9 @@ import javax.swing.UIManager;
*/ */
public class Platform extends processing.app.Platform { public class Platform extends processing.app.Platform {
// TODO Need to be smarter here since KDE people ain't gonna like that GTK.
// It may even throw a weird exception at 'em for their trouble.
@Override @Override
public void setLookAndFeel() throws Exception { public void setLookAndFeel() throws Exception {
super.setLookAndFeel();
GTKLookAndFeelFixer.installGtkPopupBugWorkaround(); GTKLookAndFeelFixer.installGtkPopupBugWorkaround();
} }

2
build/linux/dist/arduino vendored
View File

@ -25,7 +25,7 @@ if [ -x "$APPDIR/java/bin/java" ]; then
fi fi
# Collect options to java in an array, to properly handle whitespace in options # Collect options to java in an array, to properly handle whitespace in options
JAVA_OPTIONS=("-DAPP_DIR=$APPDIR" "-Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel") JAVA_OPTIONS=("-DAPP_DIR=$APPDIR")
# Only show the splash screen when no options are present # Only show the splash screen when no options are present
if [[ "$@" != *"--"* ]] ; then if [[ "$@" != *"--"* ]] ; then