From: adam <adam@megacz.com>
Date: Mon, 12 Apr 2004 06:47:09 +0000 (+0000)
Subject: resolve darcs stupidity
X-Git-Tag: RC4~2
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=da1f843588c8bd2b2c7cc74a5b4ffff8d57ab712;p=org.ibex.core.git

resolve darcs stupidity

darcs-hash:20040412064709-5007d-0a1dacce87ba901be4442fb293f97e9d8096153f.gz
---

diff --git a/doc/reference/reference.xml b/doc/reference/reference.xml
index ac79dec..cd23448 100644
--- a/doc/reference/reference.xml
+++ b/doc/reference/reference.xml
@@ -240,6 +240,7 @@
 
   <section title="Static Code">
 
+v v v v v v v
     If the root [[&lt;ibex&gt;]] element contains any non-whitespace
     text content, this text is interpreted as JavaScript code and is
     executed the first time the template is referenced.  This code is
@@ -255,6 +256,28 @@
       and written) from both static scripts as well as instance
       scripts in a particular template. FIXME
       </definition>
+*************
+v v v v v v v
+    If the root <t>&lt;ibex&gt;</t> element contains any non-whitespace
+    text content, this text is interpreted as JavaScript code and is
+    executed the first time the template is referenced.  This code is
+    executed in a fresh scope containing two predefined properties:
+  
+    <definition term="ibex">
+      The Ibex Object (described in <ref section="The Ibex Object"/>)
+      </definition>
+  
+    <definition term="static">
+      A reference to this template's <i>static object</i>, which is
+      initially <t>null</t>.  The static object can be accessed (read
+      and written) from both static scripts as well as instance
+      scripts in a particular template. FIXME
+      </definition>
+*************
+<!-- _______________________________________________________________________ -->
+<section title="Layout and Rendering">
+^ ^ ^ ^ ^ ^ ^
+^ ^ ^ ^ ^ ^ ^
 
     </section>
   
diff --git a/src/org/ibex/Box.java b/src/org/ibex/Box.java
index be1c4f4..c898d8e 100644
--- a/src/org/ibex/Box.java
+++ b/src/org/ibex/Box.java
@@ -143,8 +143,8 @@ public final class Box extends JSScope implements Scheduler.Task {
     public void perform() throws JSExn {
         if (texture == null) { Log.warn(Box.class, "perform() called with null texture"); return; }
         if (texture.isLoaded) {
-            setMinWidth(max(texture.width, maxwidth));
-            setMinHeight(max(texture.height, maxheight));
+            setWidth(max(texture.width, maxwidth), maxwidth); 
+            setHeight(max(texture.height, maxheight), maxheight); 
             DIRTY; }
         else { JS res = texture.stream; texture = null; throw new JSExn("image not found: "+res.unclone()); }
     }