[Laszlo-checkins] r11866 - openlaszlo/trunk/lps/components/utils/layouts

[ptw@openlaszlo.org]

Author: ptw
Date: 2008-11-24 13:41:13 -0800 (Mon, 24 Nov 2008)
New Revision: 11866

Modified:
   openlaszlo/trunk/lps/components/utils/layouts/wrappinglayout.lzx
Log:
Change 20081120-ptw-9 by ptw at dueling-banjos.home on 2008-11-20 13:16:17 EST
    in /Users/ptw/OpenLaszlo/trunk
    for http://svn.openlaszlo.org/openlaszlo/trunk

Summary: Fix wrapping layout spacing constraints

Bugs Fixed:
LPP-7376 Error when constraining spacing in wrappinglayout

Technical Reviewer: max (pending)
QA Reviewer: vishvananda at yahoo.com (pending)

Details:
    Original code was trying to be too clever in defaulting x/y
    spacing from spacing.  Just do it straighforwardly and it happens
    to work.

Tests:
    Test case from bug report



Modified: openlaszlo/trunk/lps/components/utils/layouts/wrappinglayout.lzx
===================================================================
--- openlaszlo/trunk/lps/components/utils/layouts/wrappinglayout.lzx	2008-11-24 21:12:14 UTC (rev 11865)
+++ openlaszlo/trunk/lps/components/utils/layouts/wrappinglayout.lzx	2008-11-24 21:41:13 UTC (rev 11866)
@@ -15,25 +15,15 @@
     <attribute name="yinset" value="0"/>
     <!--- A pixel amount to use between the views controlled by the layout in
           the x axis. -->
-    <attribute name="xspacing" value="null" />
+    <attribute name="xspacing" value="${this.spacing}" />
     <!--- A pixel amount to use between the views controlled by the layout in
           the y axis. -->
-    <attribute name="yspacing" value="null" />
+    <attribute name="yspacing" value="${this.spacing}" />
     <!--- If given, a number of miliseconds to use to animate the views in to
           place.-->
     <attribute name="duration"     value="0"/>
 
     <!--- @keywords private -->
-    <method name="construct" args="parent, args">
-        super.construct(parent, args);
-        <!-- The class default value is this.spacing, but the user may override that in args -->
-        <!-- If x and y spacing are not specified they take on the default value -->
-        var defaultSpacing = ('spacing' in args)?args.spacing:this.spacing;
-        if (! ('xspacing' in args)) args.xspacing = defaultSpacing;
-        if (! ('yspacing' in args)) args.yspacing = defaultSpacing;
-    </method>
-
-    <!--- @keywords private -->
     <method name="setAxis" args="a" >
         <!-- CURRENTLY THIS METHOD IS NOT USED -->
         this.axis = a;