X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2FBox.java;h=5187dc053d9410172c44c1936eb6e63c7ea38271;hb=2ccad2219888c9942f62ae8b4d4207f655690948;hp=cb9f53aa97ed757f2e025c86e3db54e56999c1cf;hpb=3f6848147c91803ecf88f5b2aa3e038365eca1f0;p=org.ibex.core.git

diff --git a/src/org/xwt/Box.java b/src/org/xwt/Box.java
index cb9f53a..5187dc0 100644
--- a/src/org/xwt/Box.java
+++ b/src/org/xwt/Box.java
@@ -39,7 +39,7 @@ import org.xwt.translators.*;
  *  SizeChanges trigger an Surface.abort; if rendering were done in the same
  *  pass, rendering work done prior to the Surface.abort would be wasted.
  */
-public final class Box extends JSScope {
+public final class Box extends JSScope implements Scheduler.Task {
 
     // Macros //////////////////////////////////////////////////////////////////////
 
@@ -123,7 +123,7 @@ public final class Box extends JSScope {
 
     private String text = null;
     private Font font = DEFAULT_FONT; 
-    private Picture.Holder texture;
+    private Picture texture;
     private short strokewidth = 1;
     private int fillcolor = 0x00000000;
     private int strokecolor = 0xFF000000;
@@ -157,6 +157,15 @@ public final class Box extends JSScope {
 
     // Instance Methods /////////////////////////////////////////////////////////////////////
 
+
+    /** invoked when a resource needed to render ourselves finishes loading */
+    public void perform() {
+        MARK_REPACK;
+        MARK_REFLOW;
+        MARK_RESIZE;
+        dirty();
+    }
+
     public Box getRoot() { return parent == null ? this : parent.getRoot(); }
     public Surface getSurface() { return Surface.fromBox(getRoot()); }
 
@@ -257,6 +266,7 @@ public final class Box extends JSScope {
     
     private void resize(LENGTH x, LENGTH y, LENGTH width, LENGTH height) {
         // FEATURE reimplement, but we're destroying this
+        // FIXME: uncommenting this breaks; see http://bugs.xwt.org/show_bug.cgi?id=345
         //if (x != this.x || y != this.y || width != this.width || height != this.height) {
             (parent == null ? this : parent).dirty(this.x, this.y, this.width, this.height);
             boolean sizechange = (this.width != width || this.height != height) && getTrap("SizeChange") != null;
@@ -355,15 +365,14 @@ public final class Box extends JSScope {
         if ((fillcolor & 0xFF000000) != 0x00000000)
             buf.fillTrapezoid(globalx, globalx + width, globaly, globalx, globalx + width, globaly + height, fillcolor);
 
-        if (texture != null && texture.picture != null)
-            for(int x = globalx; x < cx2; x += texture.picture.getWidth())
-                for(int y = globaly; y < cy2; y += texture.picture.getHeight())
-                    buf.drawPicture(texture.picture, x, y, cx1, cy1, cx2, cy2);
+        if (texture != null && texture.isLoaded)
+            for(int x = globalx; x < cx2; x += texture.width)
+                for(int y = globaly; y < cy2; y += texture.height)
+                    buf.drawPicture(texture, x, y, cx1, cy1, cx2, cy2);
 
         if (text != null && !text.equals("") && font != null)
             if (font.rasterizeGlyphs(text, buf, strokecolor, globalx, globaly, cx1, cy1, cx2, cy2, null) == -1)
-                font.rasterizeGlyphs(text, buf, strokecolor, globalx, globaly, cx1, cy1, cx2, cy2,
-                                    new Scheduler.Task() { public void perform() { Box b = Box.this; MARK_REFLOW_b; dirty(); }});
+                font.rasterizeGlyphs(text, buf, strokecolor, globalx, globaly, cx1, cy1, cx2, cy2, this);
 
         for(Box b = getChild(0); b != null; b = b.nextSibling())
             b.render(globalx, globaly, cx1, cy1, cx2, cy2, buf, null);
@@ -506,12 +515,7 @@ public final class Box extends JSScope {
         case "SizeChange":   return;  // prevent stuff from hitting the Hash
         case "childadded":   return;  // prevent stuff from hitting the Hash
         case "childremoved": return;  // prevent stuff from hitting the Hash
-        case "thisbox": {
-            if (value != null) break;
-            if (parent != null) { parent.removeChild(parent.indexNode(this)); return; }
-            Surface surface = Surface.fromBox(this); 
-            if (surface != null) surface.dispose(true);
-        }
+        case "thisbox": if (value == null) removeSelf();
         default: super.put(name, value);
         //#end
     }
@@ -568,17 +572,21 @@ public final class Box extends JSScope {
             return;
         }
         if (!(value instanceof Res)) return;
-        texture = Picture.fromRes((Res)value, null);
-        if (texture != null) {
-            minwidth = texture.picture.getWidth();
-            minheight = texture.picture.getHeight();
+
+
+        // FIXME
+        texture = Picture.load((Res)value, this);
+        if (texture.isLoaded) {
+            minwidth = texture.width;
+            minheight = texture.height;
             MARK_REFLOW;
             dirty();
             return;
         }
-        texture = Picture.fromRes((Res)value, new Scheduler.Task() { public void perform() {
-            minwidth = texture.picture.getWidth();
-            minheight = texture.picture.getHeight();
+        texture = Picture.load((Res)value, new Scheduler.Task() { public void perform() {
+            // FIXME pass this instead of a new Task?
+            minwidth = texture.width;
+            minheight = texture.height;
             Box b = Box.this; MARK_REFLOW_b;
             dirty();
         } });
@@ -683,6 +691,12 @@ public final class Box extends JSScope {
 
     // Tree Manipulation /////////////////////////////////////////////////////////////////////
 
+    void removeSelf() {
+        if (parent != null) { parent.removeChild(parent.indexNode(this)); return; }
+        Surface surface = Surface.fromBox(this); 
+        if (surface != null) surface.dispose(true);
+    }
+
     /** remove the i^th child */
     public void removeChild(int i) {
         Box b = getChild(i);