Skip to content

Fix LookAndFeel loader NPE if missing libgtk2.0 #8132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 5, 2018
Merged

Fix LookAndFeel loader NPE if missing libgtk2.0 #8132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d937fe9
Fix LookAndFeel loader
cmaglie Oct 24, 2018
3e0a0a3
Override desktop check when setting look and feel on linux
cmaglie Oct 24, 2018
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
5 changes: 3 additions & 2 deletions arduino-core/src/processing/app/linux/Platform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@
*/
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 {
// Override desktop check
System.setProperty("sun.desktop", "gnome");
super.setLookAndFeel();
GTKLookAndFeelFixer.installGtkPopupBugWorkaround();
}

Expand Down
2 changes: 1 addition & 1 deletion build/linux/dist/arduino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down