fix bug 556

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

diff --git a/src/org/ibex/core/Box.java b/src/org/ibex/core/Box.java
index 4967252..629b263 100644 (file)
--- a/src/org/ibex/core/Box.java
+++ b/src/org/ibex/core/Box.java
@@ -65,8 +65,8 @@ public final class Box extends JSScope implements Task {
     static final int MOUSEINSIDE  = 0x00000001;
     static final int VISIBLE      = 0x00000002;
     static final int PACKED       = 0x00000004;
-    static final int HSHRINK      = 0x00000008;
-    static final int VSHRINK      = 0x00000010;
+    public static final int HSHRINK      = 0x00000008;
+    public static final int VSHRINK      = 0x00000010;
     static final int BLACK        = 0x00000020;  // for red-black code
 
     static final int FIXED        = 0x00000040;
@@ -123,8 +123,8 @@ public final class Box extends JSScope implements Task {
     public int ay = 0;   // FEATURE: roll these into x/y; requires lots of changes; perhaps y()?
     public int width = 0;
     public int height = 0;
-    private int contentwidth = 0;      // == max(minwidth, textwidth, sum(child.contentwidth))
-    private int contentheight = 0;
+    public int contentwidth = 0;      // == max(minwidth, textwidth, sum(child.contentwidth))
+    public int contentheight = 0;
 
     private Path path = null;
     /*
@@ -170,8 +170,14 @@ public final class Box extends JSScope implements Task {
     // Reflow ////////////////////////////////////////////////////////////////////////////////////////
 
     /** should only be invoked on the root box */
-    public void reflow() { pack(); resize(x, y, maxwidth, maxheight); place(); }
-
+    public void reflow() {
+        pack();
+        resize(x, y,
+               test(HSHRINK) ? contentwidth : maxwidth,
+               test(VSHRINK) ? contentheight : maxheight);
+        place();
+    }
+    
     private static Box[] frontier = new Box[65535];
     /** pack the boxes into rows and columns, compute contentwidth */
     public void pack() {
@@ -819,7 +825,7 @@ public final class Box extends JSScope implements Task {
     void set(int mask) { flags |= mask; }
     void set(int mask, boolean setclear) { if (setclear) set(mask); else clear(mask); }
     void clear(int mask) { flags &= ~mask; }
-    boolean test(int mask) { return ((flags & mask) == mask); }
+    public boolean test(int mask) { return ((flags & mask) == mask); }
     
 
     // Tree Handling //////////////////////////////////////////////////////////////////////