2003/10/25 07:50:20

[org.ibex.core.git] / src / org / xwt / Box.java.pp

diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java.pp
index 283fe45..2df28b0 100644 (file)
--- a/src/org/xwt/Box.java.pp
+++ b/src/org/xwt/Box.java.pp
@@ -247,7 +247,7 @@ public final class Box extends JS.Scope {
         // --- Phase 1 ----------------------------------------------------------------------
         // assign children to their row/column positions (assuming constrained columns)
         if ((rows == 0 && cols == 0) || (rows != 0 && cols != 0)) throw new Error("rows == " + rows + "   cols == " + cols);
-        //#repeat x/y y/x width/height col/row row/col cols/rows rows/cols colspan/rowspan rowspan/colspan colWidth/rowHeight numRowsInCol/numColsInRow INNER/INNER2 maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight OUTER/OUTER2 INNER/INNER2
+        //#repeat x/y y/x width/height col/row row/col cols/rows rows/cols colspan/rowspan rowspan/colspan colWidth/rowHeight numRowsInCol/numColsInRow INNER/INNER2 maxwidth/maxheight minwidth/minheight colMaxWidth/rowMaxHeight OUTER/OUTER2 INNER/INNER2
         if (rows == 0 && numChildren() != 0) {
             int[] numRowsInCol = new int[cols];           // the number of cells occupied in each column
             Box child = getChild(0);
@@ -274,7 +274,7 @@ public final class Box extends JS.Scope {
 
         // --- Phase 2 ----------------------------------------------------------------------
         // compute the min/max sizes of the columns and rows and set our contentwidth
-        //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight numCols/numRows
+        //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight numCols/numRows textwidth/textheight
         if (numChildren() != 0) {
             int numCols = cols;
             if (numCols == 0)
@@ -512,14 +512,15 @@ public final class Box extends JS.Scope {
             // FIXME: clipping
             char c = text.charAt(i);
             Glyph g = Glyph.getGlyph(font, fontsize, c);
-           buf.drawPictureAlphaOnly(g.p,
-                                     x,
-                                     y + g.max_ascent - g.baseline,
-                                     x + g.p.getWidth(),
-                                     y + g.max_ascent - g.baseline + g.p.getHeight(),
-                                     0, 0,
-                                     g.p.getWidth(), g.p.getHeight(),
-                                     textcolor);
+            if (g.p != null)
+                buf.drawPictureAlphaOnly(g.p,
+                                         x,
+                                         y + g.max_ascent - g.baseline + g.max_descent,
+                                         x + g.p.getWidth(),
+                                         y + g.max_ascent - g.baseline + g.max_descent + g.p.getHeight(),
+                                         0, 0,
+                                         g.p.getWidth(), g.p.getHeight(),
+                                         textcolor);
             x += g.advance;
         }
     }
@@ -842,6 +843,22 @@ public final class Box extends JS.Scope {
         return parent.getRoot();
     }
 
+    public void recompute_font() {
+        try {
+            MARK_FOR_REFLOW_this;
+            textwidth = 0;
+            textheight = 0;
+            if (text == null) return;
+            for(int i=0; i<text.length(); i++) {
+                Glyph g = Glyph.getGlyph(font, fontsize, text.charAt(i));
+                textwidth += g.advance;
+                textheight = g.max_ascent;
+            }
+        } catch (Exception e) {
+            Log.log(this, e);
+        }
+    }
+
 
     // Trivial Helper Methods (should be inlined) /////////////////////////////////////////
 
@@ -914,6 +931,16 @@ public final class Box extends JS.Scope {
 
         static {
             specialBoxProperties.put("fill", new ColorBoxProperty() {
+                    public void put(Box b, Object value) {
+                        if (value != null && value instanceof Res) {
+                            b.image = Picture.fromRes((Res)value);
+                            b.minwidth = b.image.getWidth();
+                            b.minheight = b.image.getHeight();
+                            b.dirty();
+                        } else {
+                            super.put(b, value);
+                        }
+                    }
                     public int getColor(Box b) { return b.fillcolor; }
                     public void putColor(Box b, int argb) { b.fillcolor = argb; }
                 });
@@ -936,17 +963,7 @@ public final class Box extends JS.Scope {
                             if (b.textwidth != 0 || b.textheight != 0) MARK_FOR_REFLOW_b;
                            b.textwidth = b.textheight = 0;
                        } else {
-                           try {
-                                MARK_FOR_REFLOW_b;
-                                b.textwidth = 0;
-                                for(int i=0; i<b.text.length(); i++) {
-                                    Glyph g = Glyph.getGlyph(b.font, b.fontsize, b.text.charAt(i));
-                                    b.textwidth += g.advance;
-                                    b.textheight = g.max_ascent + g.max_descent;
-                                }
-                           } catch (Exception e) {
-                               Log.log(this, e);
-                           }
+                            b.recompute_font();
                        }
                        b.dirty();
                     } });
@@ -1037,6 +1054,7 @@ public final class Box extends JS.Scope {
                         MARK_FOR_REFLOW_b;
                         b.flags |= FONT_CHANGED_FLAG;
                         b.dirty();
+                        b.recompute_font();
                     } });
         
             specialBoxProperties.put("fontsize", new SpecialBoxProperty() {
@@ -1047,6 +1065,7 @@ public final class Box extends JS.Scope {
                         MARK_FOR_REFLOW_b;
                         b.flags |= FONT_CHANGED_FLAG;
                         b.dirty();
+                        b.recompute_font();
                     } });
         
             specialBoxProperties.put("strokewidth", new SpecialBoxProperty() {
@@ -1147,7 +1166,7 @@ public final class Box extends JS.Scope {
                         return new Integer(b.x);
                     }
                     public void put(Box b, Object value) {
-                        if (!((b.flags & NOTPACKED_FLAG) != 0)) return;
+                        if (!((b.flags & NOTPACKED_FLAG) != 0) && (b.parent != null || b.surface == null)) return;
                         int x = stoi(value);
                         if (x == b.x) return;
                         b.dirty();
@@ -1163,13 +1182,14 @@ public final class Box extends JS.Scope {
             specialBoxProperties.put("width", new SpecialBoxProperty() {
                     public Object get(Box b) { return new Integer(b.width); }
                     public void put(Box b, Object value) {
-                        b.width = stoi(value);
+                        int width = stoi(value);
                         if (b.parent == null && b.surface != null) {
+                            b.width = width;
                             b.surface.setSize();
                             MARK_FOR_REFLOW_b;
                         } else {
-                            if (b.minwidth == b.width && b.maxwidth == b.width) return;
-                            b.minwidth = b.maxwidth = b.width;
+                            if (b.minwidth == width && b.maxwidth == width) return;
+                            b.minwidth = b.maxwidth = width;
                             MARK_FOR_REFLOW_b;
                         }
                     } });