From seam-commits at lists.jboss.org Sat Aug 29 22:25:57 2009
Content-Type: multipart/mixed; boundary="===============9066074672615975481=="
MIME-Version: 1.0
From: seam-commits at lists.jboss.org
To: seam-commits at lists.jboss.org
Subject: [seam-commits] Seam SVN: r11449 - in sandbox/trunk/modules/xwidgets:
 src/main/javascript and 1 other directory.
Date: Sat, 29 Aug 2009 22:25:57 -0400
Message-ID: <200908300225.n7U2PvYr012983@svn01.web.mwc.hst.phx2.redhat.com>

--===============9066074672615975481==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: shane.bryzak(a)jboss.com
Date: 2009-08-29 22:25:57 -0400 (Sat, 29 Aug 2009)
New Revision: 11449

Modified:
   sandbox/trunk/modules/xwidgets/examples/panels/index.html
   sandbox/trunk/modules/xwidgets/examples/panels/panels.xw
   sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Label.js
   sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Panel.js
   sandbox/trunk/modules/xwidgets/src/main/javascript/xw.js
Log:
support panel hierarchy


Modified: sandbox/trunk/modules/xwidgets/examples/panels/index.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sandbox/trunk/modules/xwidgets/examples/panels/index.html	2009-08-29 16=
:51:42 UTC (rev 11448)
+++ sandbox/trunk/modules/xwidgets/examples/panels/index.html	2009-08-30 02=
:25:57 UTC (rev 11449)
@@ -12,7 +12,7 @@
   =

     <div id=3D"container" style=3D"border:1px solid black;width:75%;height=
:50%"></div>
     =

-    <script src=3D"../../src/main/javascript/xw.js"></script>
+    <script src=3D"../../src/main/javascript/xw.js"></script>
       =

     <script type=3D"text/javascript">           =

       // See README for notes on running in Firefox

Modified: sandbox/trunk/modules/xwidgets/examples/panels/panels.xw
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sandbox/trunk/modules/xwidgets/examples/panels/panels.xw	2009-08-29 16:=
51:42 UTC (rev 11448)
+++ sandbox/trunk/modules/xwidgets/examples/panels/panels.xw	2009-08-30 02:=
25:57 UTC (rev 11449)
@@ -16,7 +16,13 @@
     <label value=3D"right"/>
   </panel>    =

 =

-  <panel align=3D"client">
-    <label value=3D"client"/>  =

+  <panel align=3D"client" layout=3D"border">
+    <panel align=3D"left" width=3D"120">
+      <label value=3D"client:left"/>
+    </panel>
+    =

+    <panel align=3D"client">
+      <label value=3D"client:client"/>
+    </panel>
   </panel>
 </view>

Modified: sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Label.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Label.js	2009-08-=
29 16:51:42 UTC (rev 11448)
+++ sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Label.js	2009-08-=
30 02:25:57 UTC (rev 11449)
@@ -11,14 +11,14 @@
     this.parent =3D parent;
   }
   =

-  xw.controls.Label.prototype.paint =3D function()
-  {
+  xw.controls.Label.prototype.paint =3D function(layout)
+  {
     if (this.control =3D=3D null)
     {
       this.control =3D document.createTextNode(this.value);
       // IE doesn't support setting random properties on text nodes
       // this.control.widget =3D this;
-      this.parent.control.appendChild(this.control);
-    }       =

+      this.parent.appendChild(this.control);
+    }       =

   }
 }

Modified: sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Panel.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Panel.js	2009-08-=
29 16:51:42 UTC (rev 11448)
+++ sandbox/trunk/modules/xwidgets/src/main/javascript/xw.Panel.js	2009-08-=
30 02:25:57 UTC (rev 11449)
@@ -4,9 +4,17 @@
 {
   this.width =3D 200;
   this.height =3D 100; =

-  this.parent =3D null;
+  this.parent =3D null;
+  =

+  // the outer div
   this.control =3D null;
+  =

+  // the inner div
+  this.inner =3D null;
+  =

   this.align =3D null;
+  this.layout =3D null;
+  this.layoutManager =3D null;
     =

   xw.controls.Panel.prototype.setParent =3D function(parent)
   {
@@ -29,39 +37,102 @@
   }
   =

   xw.controls.Panel.prototype.paint =3D function(layout)
-  {
-     if (this.control =3D=3D null)
-     {
-       this.control =3D document.createElement("div");
-       this.control.widget =3D this;              =

-       this.control.style.backgroundColor =3D "#ece9d6";
+  {
+    if (this.control =3D=3D null)
+    {
+      this.control =3D document.createElement("div");
+      this.control.widget =3D this;              =

+      this.control.style.backgroundColor =3D "#ece9d6";
        =

-       // TODO make the border more configurable (or allow it to be turned=
 off etc)
-       this.control.style.borderTop =3D "1px solid white";
-       this.control.style.borderLeft =3D "1px solid white";
-       this.control.style.borderBottom =3D "1px solid #555555";
-       this.control.style.borderRight =3D "1px solid #555555";
+      // TODO make the border more configurable (or allow it to be turned =
off etc)
+      this.control.style.borderTop =3D "1px solid white";
+      this.control.style.borderLeft =3D "1px solid white";
+      this.control.style.borderBottom =3D "1px solid #555555";
+      this.control.style.borderRight =3D "1px solid #555555";
+      =

+      this.control.style.padding =3D "0px";
+      this.control.style.margin =3D "0px";
        =

-       if (layout !=3D null)
-       {
-         layout.setBounds(this);
-       }
-       else
-       {
-         this.control.style.width =3D this.width;
-         this.control.style.height =3D this.height;         =

-         this.control.style.display =3D "inline";
-       }
+      if (layout !=3D null)
+      {
+        var bounds =3D layout.getBounds(this);
+        if (bounds !=3D null) this.applyBounds(bounds);
+      }
+      else
+      {
+        this.control.style.width =3D this.width;
+        this.control.style.height =3D this.height;         =

+        this.control.style.display =3D "inline";
+      }
 =

-       this.parent.control.appendChild(this.control);
-     }    =

-     =

-     if (this.children)
-     {
-       for (var i =3D 0; i < this.children.length; i++)
-       {
-         this.children[i].paint(); =

-       }     =

-     }   =

-  }
+      this.parent.appendChild(this.control);
+    }    =

+        =

+    if (this.inner =3D=3D null)
+    {
+      this.inner =3D document.createElement("div");
+      this.inner.widget =3D this;
+      this.inner.style.width =3D "100%";
+      this.inner.style.height =3D "100%";
+      this.inner.style.position =3D "relative";
+      this.inner.style.border =3D "0px";    =

+      this.control.appendChild(this.inner);      =

+    }
+          =

+    // Create the appropriate layout manager and layout the child controls
+    if (this.layoutManager =3D=3D null && this.layout !=3D null) =

+    {
+      this.layoutManager =3D new xw.layoutManagers[this.layout](this);  =

+    }
+    else
+    {
+      this.layoutManager =3D new xw.DefaultLayout(this);
+    }
+    =

+    this.layoutManager.layout(this);           =

+  }  =

+  =

+  xw.controls.Panel.prototype.appendChild =3D function(child)
+  {
+    this.inner.appendChild(child);
+  }
+  =

+  xw.controls.Panel.prototype.getContainingControl =3D function()
+  {
+    return this.inner;
+  }
+  =

+  xw.controls.Panel.prototype.applyBounds =3D function(bounds)
+  {  =

+    if (bounds.left !=3D null) this.control.style.left =3D bounds.left + "=
px";
+    if (bounds.top !=3D null) this.control.style.top =3D bounds.top + "px";
+    =

+    for (var i in bounds.style) this.control.style[i] =3D bounds.style[i];
+  =

+    var b =3D xw.Sys.getBorder(this.control);
+   =

+    if (bounds.height !=3D null) =

+    {
+      if (bounds.height.indexOf("%") =3D=3D -1)
+      {
+        this.control.style.height =3D (bounds.height - b.top - b.bottom) +=
 "px";
+      }
+      else
+      {
+        this.control.style.height =3D bounds.height;
+      }
+    }
+    =

+    if (bounds.width !=3D null) =

+    {
+      if (bounds.width.indexOf("%") =3D=3D -1)
+      {
+        this.control.style.width =3D (bounds.width - b.left - b.right) + "=
px";
+      }
+      else
+      {
+        this.control.style.width =3D bounds.width;
+      }
+    }
+  }  =

 }

Modified: sandbox/trunk/modules/xwidgets/src/main/javascript/xw.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- sandbox/trunk/modules/xwidgets/src/main/javascript/xw.js	2009-08-29 16:=
51:42 UTC (rev 11448)
+++ sandbox/trunk/modules/xwidgets/src/main/javascript/xw.js	2009-08-30 02:=
25:57 UTC (rev 11449)
@@ -598,31 +598,37 @@
     this.style[property] =3D value;
     return this;
   }
+}
+
+/** LAYOUT MANAGERS **/
+
+xw.DefaultLayout =3D function(container)
+{
+  this.container =3D container;
   =

-  xw.Bounds.prototype.applyToControl =3D function(control)
-  {  =

-    if (this.left !=3D null) control.style.left =3D this.left + "px";
-    if (this.top !=3D null) control.style.top =3D this.top + "px";    =

-    =

-    for (var i in this.style) control.style[i] =3D this.style[i];         =
     =

-  =

-    var b =3D xw.Sys.getBorder(control);
-   =

-    if (this.height !=3D null) control.style.height =3D (this.height - b.t=
op - b.bottom) + "px";
-    if (this.width !=3D null) control.style.width =3D (this.width - b.left=
 - b.right) + "px";
+  xw.DefaultLayout.prototype.layout =3D function()
+  {
+    if (this.container.children)
+    {
+      for (var i =3D 0; i < this.container.children.length; i++)
+      {
+        this.container.children[i].paint();
+      }
+    }
   }
 }
 =

-/** LAYOUT MANAGERS **/
-
 xw.BorderLayout =3D function(container)
 {
   this.container =3D container;
   this.bounds =3D new xw.Map();
-  =

+    =

   xw.BorderLayout.prototype.layout =3D function()
   {      =

-    this.container.control.style.position =3D "relative";
+    // TODO - support percentage widths
+  =

+    this.container.getContainingControl().style.position =3D "relative";
+    =

     var topControls =3D new Array();
     var bottomControls =3D new Array();
     var leftControls =3D new Array();
@@ -653,7 +659,6 @@
         .addStyleProperty("right", "0");      =

     =

       this.bounds.put(topControls[i], bounds);
-
       topSpace +=3D 1.0 * topControls[i].height;
     }
     =

@@ -701,23 +706,22 @@
         .addStyleProperty("bottom", bottomSpace + "px")
       );    =

     }
-  =

+  =

     for (var i =3D 0; i < this.container.children.length; i++)
     {
       this.container.children[i].paint(this); =

     }
   }
   =

-  xw.BorderLayout.prototype.setBounds =3D function(ctl)
+  xw.BorderLayout.prototype.getBounds =3D function(ctl)
   {
-    var bounds =3D this.bounds.get(ctl);
-    if (bounds !=3D null) bounds.applyToControl(ctl.control);
+    return this.bounds.get(ctl);
   }  =

 }
 =

 xw.layoutManagers =3D new Object();
 xw.layoutManagers["border"] =3D xw.BorderLayout;
-
+
 /**
  * A single instance of a view
  */
@@ -761,10 +765,20 @@
     var callback =3D function() { target.resize(); };
     xw.Sys.chainEvent(window, "resize", callback);    =

     =

-    // Layout the child controls
+    // Create the appropriate layout manager and layout the child controls
     if (this.layout !=3D null) this.layoutManager =3D new xw.layoutManager=
s[this.layout](this);  =

     this.layoutManager.layout();            =

-  }  =

+  }  =

+  =

+  xw.View.prototype.appendChild =3D function(child)
+  {
+    this.control.appendChild(child);
+  }
+  =

+  xw.View.prototype.getContainingControl =3D function()
+  {
+    return this.control;
+  }
 }
 =

 /**


--===============9066074672615975481==--