2003/10/16 10:20:37

darcs-hash:20040130073927-2ba56-89d3526bcf97e9d6b0b48d5792a508abce20c825.gz

diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java.pp
index e6c7201..283fe45 100644 (file)
--- a/src/org/xwt/Box.java.pp
+++ b/src/org/xwt/Box.java.pp
@@ -84,15 +84,20 @@ public final class Box extends JS.Scope {
 
     // Flags ///////////////////////////////////////////////////////////////////////////////
     short flags = 0;
-    static int MOUSEINSIDE_FLAG  = 0x00000001;
-    static int INVISIBLE_FLAG    = 0x00000002;
-    static int NOTPACKED_FLAG    = 0x00000004;
-    static int HSHRINK_FLAG      = 0x00000008;
-    static int VSHRINK_FLAG      = 0x00000010;
-    static int TILE_FLAG         = 0x00000020;
-    static int FONT_CHANGED_FLAG = 0x00000040;  // set when font changes, cleared during repack
-    static int ISROOT_FLAG       = 0x00000080;
-    static int NOCLIP_FLAG       = 0x00000100;
+    static final int MOUSEINSIDE_FLAG  = 0x00000001;
+    static final int INVISIBLE_FLAG    = 0x00000002;
+    static final int NOTPACKED_FLAG    = 0x00000004;
+    static final int HSHRINK_FLAG      = 0x00000008;
+    static final int VSHRINK_FLAG      = 0x00000010;
+    static final int TILE_FLAG         = 0x00000020;
+    static final int FONT_CHANGED_FLAG = 0x00000040;  // set when font changes, cleared during repack
+    static final int ISROOT_FLAG       = 0x00000080;
+    static final int NOCLIP_FLAG       = 0x00000100;
+    static final int ALIGN_TOP_FLAG    = 0x00001000;
+    static final int ALIGN_BOTTOM_FLAG = 0x00002000;
+    static final int ALIGN_LEFT_FLAG   = 0x00004000;
+    static final int ALIGN_RIGHT_FLAG  = 0x00008000;
+    static final int ALIGN_FLAGS       = 0x0000f000;
 
 
     // Geometry ////////////////////////////////////////////////////////////////////////////
@@ -403,10 +408,13 @@ public final class Box extends JS.Scope {
                 child_height = ((child.flags & VSHRINK_FLAG) != 0) ? child.contentheight : min(child.maxheight, height - child.y);
             } else {
                 int diff;
-                //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight HSHRINK_FLAG/VSHRINK_FLAG marginWidth/marginHeight child_x/child_y child_width/child_height
+                //#repeat x/y y/x width/height col/row cols/rows colspan/rowspan colWidth/rowHeight maxwidth/maxheight minwidth/minheight contentwidth/contentheight colMaxWidth/rowMaxHeight HSHRINK_FLAG/VSHRINK_FLAG marginWidth/marginHeight child_x/child_y child_width/child_height ALIGN_LEFT_FLAG/ALIGN_TOP_FLAG ALIGN_RIGHT_FLAG/ALIGN_BOTTOM_FLAG
                 child_width = 0; for(int i=child.col; i<child.col+child.colspan && i<colWidth.length; i++) child_width += colWidth[i];
                 diff = bound(child.contentwidth, child_width, ((child.flags & HSHRINK_FLAG) != 0) ? child.contentwidth : child.maxwidth) - child_width;
-                if (transform == null) child_x = marginWidth / 2;
+                if (transform == null) {
+                    if ((flags & ALIGN_RIGHT_FLAG) != 0) child_x = marginWidth;
+                    else if ((flags & ALIGN_LEFT_FLAG) == 0) child_x = marginWidth / 2;
+                }
                 for(int i=0; i<child.col; i++) child_x += colWidth[i];
                 if (diff < 0) child_x += -1 * (diff / 2);
                 child_width += diff;
@@ -1049,6 +1057,37 @@ public final class Box extends JS.Scope {
                         b.dirty();
                     } });
         
+            specialBoxProperties.put("align", new SpecialBoxProperty() {
+                    public Object get(Box b) {
+                        switch(b.flags & ALIGN_FLAGS) {
+                        case (ALIGN_TOP_FLAG | ALIGN_LEFT_FLAG): return "topleft";
+                        case (ALIGN_BOTTOM_FLAG | ALIGN_LEFT_FLAG): return "bottomleft";
+                        case (ALIGN_TOP_FLAG | ALIGN_RIGHT_FLAG): return "topright";
+                        case (ALIGN_BOTTOM_FLAG | ALIGN_RIGHT_FLAG): return "bottomright";
+                        case ALIGN_TOP_FLAG: return "top";
+                        case ALIGN_BOTTOM_FLAG: return "bottom";
+                        case ALIGN_LEFT_FLAG: return "left";
+                        case ALIGN_RIGHT_FLAG: return "right";
+                        case 0: return "center";
+                        default: throw new Error("invalid alignment flags: " + (b.flags & ALIGN_FLAGS));
+                        }
+                    }
+                    public void put(Box b, Object value) {
+                        b.flags &= ~ALIGN_FLAGS;
+                        if (value == null || value.equals("center")) { b.flags &= ALIGN_FLAGS; }
+                        else if (value.equals("topleft")) { b.flags |= ALIGN_TOP_FLAG | ALIGN_LEFT_FLAG; }
+                        else if (value.equals("bottomleft")) { b.flags |= ALIGN_BOTTOM_FLAG | ALIGN_LEFT_FLAG; }
+                        else if (value.equals("topright")) { b.flags |= ALIGN_TOP_FLAG | ALIGN_RIGHT_FLAG; }
+                        else if (value.equals("bottomright")) { b.flags |= ALIGN_BOTTOM_FLAG | ALIGN_RIGHT_FLAG; }
+                        else if (value.equals("top")) { b.flags |= ALIGN_TOP_FLAG; }
+                        else if (value.equals("bottom")) { b.flags |= ALIGN_BOTTOM_FLAG; }
+                        else if (value.equals("left")) { b.flags |= ALIGN_LEFT_FLAG; }
+                        else if (value.equals("right")) { b.flags |= ALIGN_RIGHT_FLAG; }
+                        else Log.logJS("invalid alignment specifier \"" + value + "\"");
+                        MARK_FOR_REFLOW_b;
+                        b.dirty();
+                    } });
+        
             specialBoxProperties.put("thisbox", new SpecialBoxProperty() {
                     public Object get(Box b) { return b; }
                     public void put(Box b, Object value) {