Skip to content

Commit 767867b

Browse files
committed
Revert "Moved -Dawt.useSystemAAFontSettings=on out of java code, where, apparently,"
Fonts on Windows became ugly, reverting whole the commit since it brings no visible changes to Linux and OSX This reverts commit 6c5e584.
1 parent 22a37ea commit 767867b

File tree

6 files changed

+4
-4
lines changed

6 files changed

+4
-4
lines changed

app/src/processing/app/Base.java

+1
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ public class Base {
122122
private final List<JMenuItem> recentSketchesMenuItems;
123123

124124
static public void main(String args[]) throws Exception {
125+
System.setProperty("awt.useSystemAAFontSettings", "on");
125126
System.setProperty("swing.aatext", "true");
126127
System.setProperty("java.net.useSystemProxies", "true");
127128

arduino-core/src/processing/app/macosx/Platform.java

+2
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ public Platform() {
6363
public void init() throws Exception {
6464
super.init();
6565

66+
System.setProperty("apple.laf.useScreenMenuBar", "true");
67+
6668
discoverRealOsArch();
6769
}
6870

build/build.xml

-1
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,6 @@
336336
<option value="-Dcom.apple.macos.useScreenMenuBar=true"/>
337337
<option value="-DAPP_DIR=$APP_ROOT/Contents/Java"/>
338338
<option value="-Djava.ext.dirs=$JVM_RUNTIME/Contents/Home/lib/ext/:$JVM_RUNTIME/Contents/Home/jre/lib/ext/"/>
339-
<option value="-Dawt.useSystemAAFontSettings=on"/>
340339

341340
<!--
342341
<option value="-Dapple.awt.showGrowBox=false"/>

build/linux/dist/arduino

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ if [ -x "$APPDIR/java/bin/java" ]; then
2525
fi
2626

2727
# Collect options to java in an array, to properly handle whitespace in options
28-
JAVA_OPTIONS=("-DAPP_DIR=$APPDIR" "-Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel" "-Dawt.useSystemAAFontSettings=on")
28+
JAVA_OPTIONS=("-DAPP_DIR=$APPDIR" "-Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel")
2929

3030
if [[ "$@" != *"--upload"* && "$@" != *"--verify"* && "$@" != *"--get-pref"* && "$@" != *"--install-board"* && "$@" != *"--install-library"* ]] ; then
3131
JAVA_OPTIONS+=("-splash:$APPDIR/lib/splash.png")

build/windows/launcher/config.xml

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
<runtimeBits>32</runtimeBits>
3838
<opt>-splash:"%EXEDIR%/lib/splash.png"</opt>
3939
<opt>-Dsun.java2d.d3d=false</opt>
40-
<opt>-Dawt.useSystemAAFontSettings=on</opt>
4140
<opt>-DAPP_DIR="%EXEDIR%"</opt>
4241
</jre>
4342
<splash>

build/windows/launcher/config_debug.xml

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<path>java</path>
3737
<runtimeBits>32</runtimeBits>
3838
<opt>-Dsun.java2d.d3d=false</opt>
39-
<opt>-Dawt.useSystemAAFontSettings=on</opt>
4039
<opt>-DAPP_DIR="%EXEDIR%"</opt>
4140
<opt>-DDEBUG=true</opt>
4241
</jre>

0 commit comments

Comments
 (0)