eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

purge VAqua (resolves #129)

Browse Source
This commit is contained in:
Ben Fry
2022-01-16 15:30:53 -05:00
parent f2755d597e
commit ca08daa1aa
8 changed files with 14 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.xml
+4 -29
View File
@@ -1,29 +1,9 @@
<?xml version="1.0"?>
<project name="Processing PDE" default="build">
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- VAqua library (not sure if we'll be including this in the final 4.0) -->
<property name="vaqua.version" value="9" />
<property name="vaqua.jar" value="VAqua${vaqua.version}.jar" />
<available file="lib/${vaqua.jar}" property="vaqua.present"/>
<property name="vaqua.url"
value="https://violetlib.org/release/vaqua/${vaqua.version}" />
<target name="download-vaqua" unless="vaqua.present">
<get dest="lib" usetimestamp="true">
<url url="${vaqua.url}/${vaqua.jar}" />
</get>
</target>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- Current version of Ant that works with Processing -->
<!-- (Can't use ant.version because that conflicts w/ the built-in variable) -->
<!-- <property name="ant.version" value="1.8.2" /> -->
<!-- <echoproperties /> -->
<!-- (Cannot use ant.version as the name of the property
because that conflicts with the built-in variable) -->
<property name="ant.version.num" value="1.10.10" />
<!-- the .zip file to be downloaded -->
<property name="ant.zip" value="apache-ant-${ant.version.num}-bin.zip" />
@@ -121,7 +101,7 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<target name="compile" description="Compile sources"
depends="download-vaqua, download-ant, download-jna">
depends="download-ant, download-jna">
<condition property="core-built">
<available file="../core/library/core.jar" />
</condition>
@@ -154,8 +134,7 @@
lib/ant.jar;
lib/ant-launcher.jar;
lib/jna.jar;
lib/jna-platform.jar;
lib/VAqua9.jar"
lib/jna-platform.jar"
debug="on"
nowarn="true">
<compilerarg value="-Xlint:deprecation" />
@@ -171,14 +150,10 @@
<delete>
<fileset refid="jna.files" />
<fileset refid="ant.files" />
<fileset dir="lib">
<include name="VAqua*.jar" />
</fileset>
</delete>
<antcall target="download-ant" />
<antcall target="download-jna" />
<antcall target="download-vaqua" />
</target>
<target name="clean" description="Clean the build directories">
app/processing4-app.iml
-1
View File
@@ -6,7 +6,6 @@
<libelement value="jar://$MODULE_DIR$/lib/ant.jar!/" />
<libelement value="jar://$MODULE_DIR$/lib/ant-launcher.jar!/" />
<libelement value="file:///processing4-core/library-test/junit-4.8.1.jar" />
<libelement value="jar://$MODULE_DIR$/lib/VAqua7.jar!/" />
<src_description expected_position="0">
<src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
</src_description>
app/src/processing/app/platform/MacPlatform.java
+3 -104
View File
@@ -3,7 +3,7 @@
/*
Part of the Processing project - http://processing.org
Copyright (c) 2012-2013 The Processing Foundation
Copyright (c) 2012-2022 The Processing Foundation
Copyright (c) 2008-2012 Ben Fry and Casey Reas
This program is free software; you can redistribute it and/or
@@ -92,33 +92,6 @@ public class MacPlatform extends DefaultPlatform {
}
/*
@Override
public void setLookAndFeel() throws Exception {
super.setLookAndFeel();
String laf = UIManager.getLookAndFeel().getClass().getName();
if ("com.apple.laf.AquaLookAndFeel".equals(laf)) {
//setUIFont(new FontUIResource(".AppleSystemUIFont", Font.PLAIN, 12));
// oh my god, the kerning, the tracking, my eyes...
//setUIFont(new FontUIResource(".SFNS-Regular", Font.PLAIN, 13));
//setUIFont(new FontUIResource(Toolkit.getSansFont(14, Font.PLAIN)));
//setUIFont(new FontUIResource("Roboto-Regular", Font.PLAIN, 13));
} else if ("org.violetlib.aqua.AquaLookAndFeel".equals(laf)) {
Icon collapse = new VAquaTreeIcon(true);
Icon open = new VAquaTreeIcon(false);
Icon leaf = new VAquaEmptyIcon();
UIManager.put("Tree.closedIcon", leaf);
UIManager.put("Tree.openIcon", leaf);
UIManager.put("Tree.collapsedIcon", open);
UIManager.put("Tree.expandedIcon", collapse);
UIManager.put("Tree.leafIcon", leaf);
}
}
*/
public File getSettingsFolder() throws Exception {
return new File(getLibraryFolder(), "Processing");
}
@@ -149,6 +122,8 @@ public class MacPlatform extends DefaultPlatform {
// TODO I suspect this won't work much longer, since access to the user's
// home directory seems verboten on more recent macOS versions [fry 191008]
// However, anecdotally it seems that just using the name works,
// and the localization is handled transparently. [fry 220116]
protected String getLibraryFolder() throws FileNotFoundException {
File folder = new File(System.getProperty("user.home"), "Library");
if (!folder.exists()) {
@@ -204,80 +179,4 @@ public class MacPlatform extends DefaultPlatform {
return FileManager.findFolder(kUserDomain, kDocumentsFolderType);
}
*/
// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
// VAQUA WORKAROUNDS FROM SAM
// /**
// * Spacer icon for macOS when using Vaqua.
//
// * Due to potential rendering issues, this small spacer is used
// * to ensure that rendering is stable while using Vaqua with non-standard
// * Swing components. Without this, some sizing calculations non-standard
// * components may fail or become unreliable.
// */
// static class VAquaEmptyIcon implements Icon {
// private final int SIZE = 1;
//
// @Override
// public int getIconWidth() {
// return SIZE;
// }
//
// @Override
// public int getIconHeight() {
// return SIZE;
// }
//
// @Override
// public void paintIcon(Component c, Graphics g, int x, int y) { }
// }
//
//
// /**
// * Replacement tree icon for macOS when using Vaqua.
// *
// * Due to potential rendering issues with the regular tree icon set,
// * this replacement tree icon for macOS ensures stable rendering when using
// * Vaqua with non-standard swing components. Without this, some sizing
// * calculations within non-standard components may fail or become unreliable.
// */
// static private class VAquaTreeIcon implements Icon {
// private final int SIZE = 12;
// private final boolean isOpen;
//
// /**
// * Create a new tree icon.
// *
// * @param newIsOpen Flag indicating if the icon should be in the open or closed state at
// * construction. True if open false otherwise.
// */
// public VAquaTreeIcon(boolean newIsOpen) {
// isOpen = newIsOpen;
// }
//
// @Override
// public int getIconWidth() {
// return SIZE;
// }
//
// @Override
// public int getIconHeight() {
// return SIZE;
// }
//
// @Override
// public void paintIcon(Component c, Graphics g, int x, int y) {
// g.setColor(Color.GRAY);
//
// g.drawLine(x + SIZE / 2 - 3, y + SIZE / 2, x + SIZE / 2 + 3, y + SIZE / 2);
//
// if (!isOpen) {
// g.drawLine(x + SIZE / 2, y + SIZE / 2 - 3, x + SIZE / 2, y + SIZE / 2 + 3);
// }
// }
// }
}
app/src/processing/app/ui/EditorConsole.java
+1 -1
View File
@@ -165,7 +165,7 @@ public class EditorConsole extends JScrollPane {
StyleConstants.setItalic(errStyle, font.isItalic());
String lookAndFeel = UIManager.getLookAndFeel().getID();
if (lookAndFeel.equals("Nimbus") || lookAndFeel.equals("VAqua")) {
if (lookAndFeel.equals("Nimbus")) {
getViewport().setBackground(bgColor);
consoleTextPane.setOpaque(false);
consoleTextPane.setBackground(TRANSPARENT);
build/build.xml
-2
View File
@@ -253,7 +253,6 @@
<include name="app/lib/jna-platform.jar" />
<include name="app/lib/ant.jar" />
<include name="app/lib/ant-launcher.jar" />
<include name="app/lib/VAqua8.jar" />
</fileset>
<target name="build" description="Build Processing.">
@@ -566,7 +565,6 @@
<classpath file="../app/lib/jna-platform.jar" />
<classpath file="../app/lib/ant.jar" />
<classpath file="../app/lib/ant-launcher.jar" />
<classpath file="../app/lib/VAqua8.jar" />
<!-- Creates a copy of core.jar, but that's simplest for now. For 4.0a5
build/shared/lib/defaults.txt
-3
View File
@@ -241,9 +241,6 @@ editor.untitled.suffix=yyMMdd
# is to do a Synth LAF that gives us something not awful.
editor.laf.linux = javax.swing.plaf.nimbus.NimbusLookAndFeel
# use this to enable the VAqua Look and Feel (may be removed later)
#editor.laf.macosx = org.violetlib.aqua.AquaLookAndFeel
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
java/build.xml
-1
View File
@@ -54,7 +54,6 @@
<pathelement location="../app/lib/apple.jar" />
<pathelement location="../app/lib/jna.jar" />
<pathelement location="../app/lib/jna-platform.jar" />
<pathelement location="../app/lib/VAqua7.jar" />
<pathelement location="mode/antlr-4.7.2-complete.jar" />
<pathelement location="mode/classpath-explorer-1.0.jar" />
todo.txt
+6 -6
View File
@@ -5,12 +5,12 @@ X Move JavaFX to its own library
X https://github.com/processing/processing4/issues/348
X JavaFX no longer supported for Tools, Modes as a result
X set minimum Java version for Windows launcher to 17.0.1
X Shutting off VAqua due to interface ugliness and Contribution Manager freezing
_ https://github.com/processing/processing4/issues/129
_ now with a release 9 to cover Big Sur
_ https://violetlib.org/vaqua/downloads.html
_ make the final call to remove, or put the libs on download.processing.org
X https://github.com/processing/processing4/issues/129
X now with a release 9 to cover Big Sur
X https://violetlib.org/vaqua/downloads.html
X make the final call to remove, or put the libs on download.processing.org
X removing, with the theming integration, gonna head that direction instead
contribs
X select entire line when doing Edit > Copy on an empty selection
@@ -24,7 +24,7 @@ _ Export to Application not working with the current video library
_ https://github.com/processing/processing-video/issues/188
_ docs are 3.x not 4.x
_ Resolve scaling issues with Windows
_ Editor cursor position is offset to the right when Windows scaling >100%
_ Editor cursor position offset to the right with fractional Windows scaling
_ https://github.com/processing/processing4/issues/342
http://openjdk.java.net/jeps/263
https://youtrack.jetbrains.com/issue/JBR-3757