rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-30 19:52:13 +01:00
Code Issues Releases Activity

Revert "Moved -Dawt.useSystemAAFontSettings=on out of java code, where, apparently,"

Browse Source 
Fonts on Windows became ugly, reverting whole the commit since it brings no visible changes to Linux and OSX

This reverts commit 6c5e58445402597f0472fbf4da9e518ff38b399b.
This commit is contained in:
Martino Facchin 2015-12-16 10:02:37 +01:00
parent 22a37ea41e
commit 767867bacb
6 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,6 +122,7 @@ public class Base {
private final List<JMenuItem> recentSketchesMenuItems;
static public void main(String args[]) throws Exception {
System.setProperty("awt.useSystemAAFontSettings", "on");
System.setProperty("swing.aatext", "true");
System.setProperty("java.net.useSystemProxies", "true");

2
arduino-core/src/processing/app/macosx/Platform.java
View File

@ -63,6 +63,8 @@ public class Platform extends processing.app.Platform {
public void init() throws Exception {
super.init();
System.setProperty("apple.laf.useScreenMenuBar", "true");
discoverRealOsArch();
}

1
build/build.xml
View File

@ -336,7 +336,6 @@
<option value="-Dcom.apple.macos.useScreenMenuBar=true"/>
<option value="-DAPP_DIR=$APP_ROOT/Contents/Java"/>
<option value="-Djava.ext.dirs=$JVM_RUNTIME/Contents/Home/lib/ext/:$JVM_RUNTIME/Contents/Home/jre/lib/ext/"/>
<option value="-Dawt.useSystemAAFontSettings=on"/>
<!--
<option value="-Dapple.awt.showGrowBox=false"/>

2
build/linux/dist/arduino vendored
View File

@ -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" "-Dawt.useSystemAAFontSettings=on")
JAVA_OPTIONS=("-DAPP_DIR=$APPDIR" "-Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel")
if [[ "$@" != *"--upload"* && "$@" != *"--verify"* && "$@" != *"--get-pref"* && "$@" != *"--install-board"* && "$@" != *"--install-library"* ]] ; then
JAVA_OPTIONS+=("-splash:$APPDIR/lib/splash.png")

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

@ -37,7 +37,6 @@
<runtimeBits>32</runtimeBits>
<opt>-splash:"%EXEDIR%/lib/splash.png"</opt>
<opt>-Dsun.java2d.d3d=false</opt>
<opt>-Dawt.useSystemAAFontSettings=on</opt>
<opt>-DAPP_DIR="%EXEDIR%"</opt>
</jre>
<splash>

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

@ -36,7 +36,6 @@
<path>java</path>
<runtimeBits>32</runtimeBits>
<opt>-Dsun.java2d.d3d=false</opt>
<opt>-Dawt.useSystemAAFontSettings=on</opt>
<opt>-DAPP_DIR="%EXEDIR%"</opt>
<opt>-DDEBUG=true</opt>
</jre>