From 26b98b8e6a35e03943bcb99422147ee1b44ae720 Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Wed, 26 Jan 2011 03:28:12 +0000
Subject: [PATCH] get toolbar working

---
 app/src/processing/app/EditorToolbar.java       | 17 ++++++++++++++++-
 .../processing/mode/android/AndroidToolbar.java |  5 ++++-
 app/src/processing/mode/java/JavaToolbar.java   |  5 ++++-
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/src/processing/app/EditorToolbar.java b/app/src/processing/app/EditorToolbar.java
index 26f97cee7..adabae153 100644
--- a/app/src/processing/app/EditorToolbar.java
+++ b/app/src/processing/app/EditorToolbar.java
@@ -98,7 +98,7 @@ public abstract class EditorToolbar extends JComponent implements MouseInputList
   int modeX1, modeY1;
   int modeX2, modeY2;
   
-  ArrayList<Button> buttons;
+  protected ArrayList<Button> buttons;
 
 
   public EditorToolbar(Editor editor, Base base) {  //, JMenu menu) {
@@ -131,6 +131,14 @@ public abstract class EditorToolbar extends JComponent implements MouseInputList
   }
 
 
+  /** Load images and add toolbar buttons */
+  abstract public void init();
+
+
+  /**
+   * Only call this from paintComponent, or when the comp is displayable, 
+   * otherwise createImage() might fail.
+   */
   public Image[][] loadImages() {
 //    Image allButtons = Base.getThemeImage("buttons.gif", this);
 //    Image allButtons = Base.loadImage(file);
@@ -141,6 +149,9 @@ public abstract class EditorToolbar extends JComponent implements MouseInputList
     
     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);
         Graphics g = image.getGraphics();
         g.drawImage(allButtons, 
@@ -158,6 +169,10 @@ public abstract class EditorToolbar extends JComponent implements MouseInputList
 
   @Override
   public void paintComponent(Graphics screen) {
+    if (buttons.size() == 0) {
+      init();
+    }
+
     // this data is shared by all EditorToolbar instances
 //    if (buttonImages == null) {
 //      loadButtons();
diff --git a/app/src/processing/mode/android/AndroidToolbar.java b/app/src/processing/mode/android/AndroidToolbar.java
index 9329f16c7..08483d481 100644
--- a/app/src/processing/mode/android/AndroidToolbar.java
+++ b/app/src/processing/mode/android/AndroidToolbar.java
@@ -41,7 +41,10 @@ public class AndroidToolbar extends EditorToolbar {
   
   public AndroidToolbar(Editor editor, Base base) {
     super(editor, base);
-    
+  }
+  
+  
+  public void init() {
     Image[][] images = loadImages();
     for (int i = 0; i < 6; i++) {
       addButton(getTitle(i, false), getTitle(i, true), images[i], i == NEW);
diff --git a/app/src/processing/mode/java/JavaToolbar.java b/app/src/processing/mode/java/JavaToolbar.java
index 68abb8d4e..663d82c78 100644
--- a/app/src/processing/mode/java/JavaToolbar.java
+++ b/app/src/processing/mode/java/JavaToolbar.java
@@ -54,7 +54,10 @@ public class JavaToolbar extends EditorToolbar {
   
   public JavaToolbar(Editor editor, Base base) {
     super(editor, base);
-    
+  }
+  
+  
+  public void init() {
     Image[][] images = loadImages();
     for (int i = 0; i < 6; i++) {
       addButton(getTitle(i, false), getTitle(i, true), images[i], i == NEW);