From 045877094b5cfb5f5c15343eddc7e9b23aad156f Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Wed, 24 Oct 2018 17:28:41 +0200 Subject: [PATCH] Fix LookAndFeel loader Fix #8119 Close #8122 --- arduino-core/src/processing/app/linux/Platform.java | 3 +-- build/linux/dist/arduino | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arduino-core/src/processing/app/linux/Platform.java b/arduino-core/src/processing/app/linux/Platform.java index 8c5072347..28cdc63f4 100644 --- a/arduino-core/src/processing/app/linux/Platform.java +++ b/arduino-core/src/processing/app/linux/Platform.java @@ -37,10 +37,9 @@ import javax.swing.UIManager; */ 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 public void setLookAndFeel() throws Exception { + super.setLookAndFeel(); GTKLookAndFeelFixer.installGtkPopupBugWorkaround(); } diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino index ad97c9160..f70c65082 100755 --- a/build/linux/dist/arduino +++ b/build/linux/dist/arduino @@ -25,7 +25,7 @@ if [ -x "$APPDIR/java/bin/java" ]; then fi # 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 if [[ "$@" != *"--"* ]] ; then