From 862ca09dae8b91533172c3d922abf7fa5a9cde3a Mon Sep 17 00:00:00 2001
From: Ben Fry <fry@processing.org>
Date: Mon, 29 Apr 2013 17:57:32 -0400
Subject: [PATCH] starting switch to new design

---
 app/src/processing/app/EditorToolbar.java |  48 ++++++++++++----------
 app/src/processing/app/Mode.java          |   3 ++
 app/src/processing/app/Toolkit.java       |   1 +
 java/theme/buttons.gif                    | Bin 2671 -> 0 bytes
 4 files changed, 30 insertions(+), 22 deletions(-)
 delete mode 100644 java/theme/buttons.gif

diff --git a/app/src/processing/app/EditorToolbar.java b/app/src/processing/app/EditorToolbar.java
index d77f8ff97..198bb3a7c 100644
--- a/app/src/processing/app/EditorToolbar.java
+++ b/app/src/processing/app/EditorToolbar.java
@@ -24,6 +24,7 @@ package processing.app;
 
 import java.awt.*;
 import java.awt.event.*;
+import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 
 import javax.swing.*;
@@ -96,17 +97,6 @@ public abstract class EditorToolbar extends JComponent implements MouseInputList
 //    this.menu = menu;
 
     buttons = new ArrayList<Button>();
-//    buttonCount = 0;
-//    which = new int[BUTTON_COUNT];
-
-//    which[buttonCount++] = RUN;
-//    which[buttonCount++] = STOP;
-//    which[buttonCount++] = NEW;
-//    which[buttonCount++] = OPEN;
-//    which[buttonCount++] = SAVE;
-//    which[buttonCount++] = EXPORT;
-
-//    currentRollover = -1;
     rollover = null;
 
     mode = editor.getMode();
@@ -131,23 +121,37 @@ public abstract class EditorToolbar extends JComponent implements MouseInputList
    * otherwise createImage() might fail.
    */
   public Image[][] loadImages() {
-//    Image allButtons = Base.getThemeImage("buttons.gif", this);
-//    Image allButtons = Base.loadImage(file);
-    Image allButtons = mode.loadImage("theme/buttons.gif");
-    int count = allButtons.getWidth(this) / BUTTON_WIDTH;
-//    System.out.println("width is " + allButtons.getWidth(this));
+    int res = Toolkit.isRetina() ? 2 : 1;
+    
+    Image allButtons = null;
+    // Some modes may not have a 2x version. If a mode doesn't have a 1x 
+    // version, this will cause an error... they should always have 1x.
+    if (res == 2) {
+      allButtons = mode.loadImage("theme/buttons-2x.png");
+      if (allButtons == null) {
+        res = 1;  // take him down a notch
+      }
+    }
+    if (res == 1) {
+      allButtons = mode.loadImage("theme/buttons.png");
+      if (allButtons == null) {
+        // use the old (pre-2.0b9) file name
+        allButtons = mode.loadImage("theme/buttons.gif");
+      }
+    }
+
+    int count = allButtons.getWidth(this) / BUTTON_WIDTH*res;
     Image[][] buttonImages = new Image[count][3];
     
     for (int i = 0; i < count; i++) {
       for (int state = 0; state < 3; state++) {
-//        Toolkit tk = Toolkit.getDefaultToolkit();
-//        Image image = tk.createImage(BUTTON_WIDTH, BUTTON_HEIGHT);
-//        System.out.println("image is " + image + " " + BUTTON_WIDTH + " " + BUTTON_HEIGHT);
-        Image image = createImage(BUTTON_WIDTH, BUTTON_HEIGHT);
+//        Image image = createImage(BUTTON_WIDTH*res, BUTTON_HEIGHT*res);
+        Image image = new BufferedImage(BUTTON_WIDTH*res, BUTTON_HEIGHT*res, BufferedImage.TYPE_INT_ARGB);
         Graphics g = image.getGraphics();
         g.drawImage(allButtons, 
-                    -(i*BUTTON_IMAGE_SIZE) - 3, 
-                    (-2 + state)*BUTTON_IMAGE_SIZE, null);
+                    -(i*BUTTON_IMAGE_SIZE*res) - 3, 
+                    (state-2)*BUTTON_IMAGE_SIZE*res, null);
+        g.dispose();
         buttonImages[i][state] = image;
       }
     }
diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java
index 2a9769585..f4b7077f8 100644
--- a/app/src/processing/app/Mode.java
+++ b/app/src/processing/app/Mode.java
@@ -803,6 +803,9 @@ public abstract class Mode {
    */
   public Image loadImage(String filename) {
     File file = new File(folder, filename);
+    if (!file.exists()) {
+      return null;
+    }
     return new ImageIcon(file.getAbsolutePath()).getImage();
   }
 
diff --git a/app/src/processing/app/Toolkit.java b/app/src/processing/app/Toolkit.java
index 97084e2f7..071a99a56 100644
--- a/app/src/processing/app/Toolkit.java
+++ b/app/src/processing/app/Toolkit.java
@@ -216,6 +216,7 @@ public class Toolkit {
 
   static Boolean retinaProp;
 
+  /** Yes, retina is a marketing term. But no, nobody else has implemented hi-dpi. */
   static public boolean isRetina() {
     if (Base.isMacOS()) {
       // This should probably be reset each time there's a display change.
diff --git a/java/theme/buttons.gif b/java/theme/buttons.gif
deleted file mode 100644
index 3d8facd00078256a77f4a20069332d3578f1a899..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2671
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