rendering variable icons from svg in the debugger

benfry · benfry · commit 9d7eca9eb14c · 2022-07-30T18:25:16.000-04:00
diff --git a/java/src/processing/mode/java/debug/VariableInspector.java b/java/src/processing/mode/java/debug/VariableInspector.java
@@ -40,6 +40,7 @@
 import processing.app.Language;
 import processing.app.Messages;
 import processing.app.Mode;
+import processing.app.ui.Toolkit;
 import processing.mode.java.JavaEditor;
 
 
@@ -295,13 +296,45 @@ public String getColumnName(int i) {
    * Handles icons, text color and tool tips.
    */
   class OutlineRenderer implements RenderDataProvider {
-    Icon[][] icons;
+    static final String ENABLED_COLOR = "#000000";
+    static final String DISABLED_COLOR = "#808080";
     static final int ICON_SIZE = 16;
 
+    // Indices correspond to VariableNode.TYPE_OBJECT...TYPE_SHORT
+    static final String[] TYPE_NAMES = {
+      "object", "array", "integer", "float", "boolean",
+      "char", "string", "long", "double", "byte", "short"
+    };
+
+    Icon[][] icons;
+
+
     OutlineRenderer() {
-      icons = loadIcons("theme/variables-1x.png");
+      icons = new Icon[][] {
+        renderIcons("object"),
+        renderIcons("array"),
+        renderIcons("integer"),
+        renderIcons("float"),
+        renderIcons("boolean"),
+        renderIcons("char"),
+        renderIcons("string"),
+        renderIcons("long"),
+        renderIcons("double"),
+        renderIcons("byte"),
+        renderIcons("short")
+      };
     }
 
+
+    private ImageIcon[] renderIcons(String type) {
+      File file = editor.getMode().getContentFile("theme/variables/" + type + ".svg");
+      return new ImageIcon[] {
+        Toolkit.renderIcon(file, ENABLED_COLOR, ICON_SIZE),
+        Toolkit.renderIcon(file, DISABLED_COLOR, ICON_SIZE)
+      };
+    }
+
+
     /**
      * Load multiple icons (horizontal) with multiple states (vertical) from
      * a single file.
@@ -334,11 +367,11 @@ private ImageIcon[][] loadIcons(String fileName) {
     }
 
 
-    protected Icon getIcon(int type, int state) {
+    protected Icon getIcon(int type, boolean enabled) {
       if (type < 0 || type > icons.length - 1) {
         return null;
       }
-      return icons[type][state];
+      return icons[type][enabled ? 0 : 1];
     }
 
 
@@ -400,7 +433,7 @@ public String getTooltipText(Object o) {
     public Icon getIcon(Object o) {
       VariableNode var = toVariableNode(o);
       if (var != null) {
-        return getIcon(var.getType(), tree.isEnabled() ? 0 : 1);
+        return getIcon(var.getType(), tree.isEnabled());
       }
       if (o instanceof TreeNode) {
         UIDefaults defaults = UIManager.getDefaults();
