Switch to VAqua on Mac for dark mode and non-terrible jfilechooser.

sampottinger · sampottinger · commit a4f112ce10c9 · 2020-04-19T23:12:50.000-07:00
diff --git a/app/build.xml b/app/build.xml
@@ -39,7 +39,8 @@
                       lib/ant.jar;
                       lib/ant-launcher.jar;
                       lib/jna.jar;
-                      lib/jna-platform.jar"
+                      lib/jna-platform.jar;
+                      lib/vaqua7.jar"
 	   debug="on"
 	   nowarn="true">
       <src path="src" />
diff --git a/app/src/processing/app/platform/DefaultPlatform.java b/app/src/processing/app/platform/DefaultPlatform.java
@@ -23,14 +23,19 @@
 
 package processing.app.platform;
 
+import java.awt.Color;
+import java.awt.Component;
 import java.awt.Desktop;
+import java.awt.Graphics;
 import java.io.File;
 import java.net.URI;
 
+import javax.swing.Icon;
 import javax.swing.UIManager;
 
 import com.sun.jna.Library;
 import com.sun.jna.Native;
+import org.violetlib.aqua.AquaLookAndFeel;
 
 import processing.app.Base;
 import processing.app.Preferences;
@@ -75,7 +80,20 @@ public void initBase(Base base) {
   public void setLookAndFeel() throws Exception {
     String laf = Preferences.get("editor.laf");
     if (laf == null || laf.length() == 0) {  // normal situation
-      UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+      if (System.getProperty("os.name", "").startsWith("Mac OS")) {
+        UIManager.setLookAndFeel("org.violetlib.aqua.AquaLookAndFeel");
+
+        Icon collapse = new MacTreeIcon(true);
+        Icon open = new MacTreeIcon(false);
+        Icon leaf = new MacEmptyIcon();
+        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);
+      } else {
+        UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+      }
     } else {
       UIManager.setLookAndFeel(laf);
     }
@@ -188,4 +206,48 @@ public float getSystemZoom() {
     return ZOOM_DEFAULT_SIZING;
   }
 
+  class MacEmptyIcon implements Icon {
+    private final int SIZE = 1;
+
+    public MacEmptyIcon() {
+    }
+
+    public int getIconWidth() {
+        return SIZE;
+    }
+
+    public int getIconHeight() {
+        return SIZE;
+    }
+
+    public void paintIcon(Component c, Graphics g, int x, int y) {}
+  }
+
+  class MacTreeIcon implements Icon {
+    private final int SIZE = 12;
+    private final boolean isOpen;
+
+    public MacTreeIcon(boolean newIsOpen) {
+      isOpen = newIsOpen;
+    }
+
+    public int getIconWidth() {
+        return SIZE;
+    }
+
+    public int getIconHeight() {
+        return SIZE;
+    }
+
+    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);
+      }
+    }
+  }
+
 }
diff --git a/app/src/processing/app/ui/EditorConsole.java b/app/src/processing/app/ui/EditorConsole.java
@@ -188,7 +188,8 @@ protected void updateMode() {
     StyleConstants.setBold(errStyle, font.isBold());
     StyleConstants.setItalic(errStyle, font.isItalic());
 
-    if (UIManager.getLookAndFeel().getID().equals("Nimbus")) {
+    String lookAndFeel = UIManager.getLookAndFeel().getID();
+    if (lookAndFeel.equals("Nimbus") || lookAndFeel.equals("VAqua")) {
       getViewport().setBackground(bgColor);
       consoleTextPane.setOpaque(false);
       consoleTextPane.setBackground(new Color(0, 0, 0, 0));
diff --git a/build/build.xml b/build/build.xml
@@ -424,6 +424,7 @@
     <include name="app/lib/jna-platform.jar" />
     <include name="app/lib/ant.jar" />
     <include name="app/lib/ant-launcher.jar" />
+    <include name="app/lib/vaqua7.jar" />
   </fileset>
 
   <target name="build" description="Build Processing.">
@@ -721,6 +722,7 @@
       <classpath file="../app/lib/jna-platform.jar" />
       <classpath file="../app/lib/ant.jar" />
       <classpath file="../app/lib/ant-launcher.jar" />
+      <classpath file="../app/lib/vaqua7.jar" />
 
       <!-- plus core.jar... note that this is no longer shared -->
       <classpath file="../core/library/core.jar" />
diff --git a/java/build.xml b/java/build.xml
@@ -54,6 +54,7 @@
     <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" />
diff --git a/java/src/processing/mode/java/debug/VariableInspector.java b/java/src/processing/mode/java/debug/VariableInspector.java
@@ -610,7 +610,7 @@ protected void setItalic(boolean on) {
     @Override
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
       Component c = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-      setForeground(tree.isEnabled() ? Color.BLACK : Color.GRAY);
+      //setForeground(tree.isEnabled() ? Color.BLACK : Color.GRAY);
 
       if (value instanceof VariableNode) {
         VariableNode var = (VariableNode) value;
