incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1394201 - in /incubator/flex/sdk/branches/develop/mustella/tests/containers/Canvas: Properties/ContentSizedConstraints_Canvas.mxml SWFs/ConstraintBasedLayout_Canvas.mxml
Date Thu, 04 Oct 2012 18:38:59 GMT
Author: cframpton
Date: Thu Oct  4 18:38:59 2012
New Revision: 1394201

URL: http://svn.apache.org/viewvc?rev=1394201&view=rev
Log:
Add embedded font and adjust values of AssertPropertyValues accordingly. 

Modified:
    incubator/flex/sdk/branches/develop/mustella/tests/containers/Canvas/Properties/ContentSizedConstraints_Canvas.mxml
    incubator/flex/sdk/branches/develop/mustella/tests/containers/Canvas/SWFs/ConstraintBasedLayout_Canvas.mxml

Modified: incubator/flex/sdk/branches/develop/mustella/tests/containers/Canvas/Properties/ContentSizedConstraints_Canvas.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/containers/Canvas/Properties/ContentSizedConstraints_Canvas.mxml?rev=1394201&r1=1394200&r2=1394201&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/containers/Canvas/Properties/ContentSizedConstraints_Canvas.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/containers/Canvas/Properties/ContentSizedConstraints_Canvas.mxml
Thu Oct  4 18:38:59 2012
@@ -82,7 +82,7 @@
         description="Verify the constraintRows has the right height when its children have
no explicit height set in mxml">
         <body>
             <AssertPropertyValue target="canvas2.constraintRows.2" propertyName="height"
valueExpression="value=application.canvas2.getChildAt(3).height + 20" />
-            <AssertPropertyValue target="canvas2.getChildAt(3)" propertyName="height"
value="180" />
+            <AssertPropertyValue target="canvas2.getChildAt(3)" propertyName="height"
value="194" />
             <AssertPropertyValue target="canvas2.getChildAt(3)" propertyName="x" value="0"
/>
             <AssertPropertyValue target="canvas2.getChildAt(3)" propertyName="y" valueExpression="value=application.canvas2.constraintRows[0].height
+ application.canvas2.constraintRows[1].height + 10" />
         </body>
@@ -91,7 +91,7 @@
         description="Verify the constraintRows has the right height when its children have
no explicit height set in mxml">
         <body>
             <AssertPropertyValue target="canvas2.constraintColumns.2" propertyName="width"
valueExpression="value=application.canvas2.getChildAt(4).width + 20" />
-            <AssertPropertyValue target="canvas2.getChildAt(4)" propertyName="width" value="95"
/>
+            <AssertPropertyValue target="canvas2.getChildAt(4)" propertyName="width" value="87"
/>
             <AssertPropertyValue target="canvas2.getChildAt(4)" propertyName="y" value="0"
/>
             <AssertPropertyValue target="canvas2.getChildAt(4)" propertyName="x" valueExpression="value=application.canvas2.constraintColumns[0].width
+ application.canvas2.constraintColumns[1].width + 10" />
         </body>
@@ -462,7 +462,7 @@
             <SetStyle styleName="baseline" valueExpression="value='row1:40'" target="script:newButton"
 />
             <SetStyle styleName="bottom" valueExpression="value='row1:10'" target="script:newButton"
 />
             <RunCode code="application.emptyCanvas.addChild(newButton)"  waitEvent="childAdd"
waitTarget="emptyCanvas"/>
-            <AssertPropertyValue target="emptyCanvas.constraintRows.0" propertyName="height"
value="62" />
+            <AssertPropertyValue target="emptyCanvas.constraintRows.0" propertyName="height"
value="64" />
             <AssertPropertyValue target="emptyCanvas.getChildAt(0)" propertyName="y" value="30"
/>
        </body>
     </TestCase>
@@ -639,7 +639,7 @@
             <RunCode code="application.emptyCanvas.addChild(newButton)"  waitEvent="childAdd"
waitTarget="emptyCanvas"/>
             
             <AssertPropertyValue target="emptyCanvas.constraintColumns.0" propertyName="width"
value="40" />
-            <AssertPropertyValue target="emptyCanvas.constraintColumns.1" propertyName="width"
value="72" />
+            <AssertPropertyValue target="emptyCanvas.constraintColumns.1" propertyName="width"
value="68" />
        </body>
     </TestCase>    
     

Modified: incubator/flex/sdk/branches/develop/mustella/tests/containers/Canvas/SWFs/ConstraintBasedLayout_Canvas.mxml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/mustella/tests/containers/Canvas/SWFs/ConstraintBasedLayout_Canvas.mxml?rev=1394201&r1=1394200&r2=1394201&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/mustella/tests/containers/Canvas/SWFs/ConstraintBasedLayout_Canvas.mxml
(original)
+++ incubator/flex/sdk/branches/develop/mustella/tests/containers/Canvas/SWFs/ConstraintBasedLayout_Canvas.mxml
Thu Oct  4 18:38:59 2012
@@ -20,26 +20,28 @@
    <mx:Application backgroundColor="0xFFFFFF" backgroundImage="" xmlns:mx="http://www.adobe.com/2006/mxml"
width="900" height="800"
        xmlns:comps="comps.*" >
 
-      <comps:PercentageRowColumnCanvasComp id="canvas1" />
-
-      <comps:ContentRowColumnCanvasComp id="canvas2" />
-
-      <mx:Canvas id="emptyCanvas" />
+	<mx:Style source="../../../../Assets/Fonts/myStyles.css" />
+	
+	<comps:PercentageRowColumnCanvasComp id="canvas1" />
+	
+	<comps:ContentRowColumnCanvasComp id="canvas2" />
+	
+	<mx:Canvas id="emptyCanvas" />
       
-    <mx:Canvas width="100%" height="100%">
-        <mx:constraintColumns>
-            <mx:ConstraintColumn id="col1" width="250"/>
-            <mx:ConstraintColumn id="col2" width="100"/>
-        </mx:constraintColumns>
-        <mx:constraintRows>
-            <mx:ConstraintRow id="row1"/>
-            <mx:ConstraintRow id="row2"/>
-            <mx:ConstraintRow id="row3"/>
-            <mx:ConstraintRow id="row4"/>
-            <mx:ConstraintRow id="row5"/>
-            <mx:ConstraintRow id="row6"/>
-            <mx:ConstraintRow id="row7"/>
-        </mx:constraintRows>
+	<mx:Canvas width="100%" height="100%">
+	<mx:constraintColumns>
+	    <mx:ConstraintColumn id="col1" width="250"/>
+	    <mx:ConstraintColumn id="col2" width="100"/>
+	</mx:constraintColumns>
+	<mx:constraintRows>
+	    <mx:ConstraintRow id="row1"/>
+	    <mx:ConstraintRow id="row2"/>
+	    <mx:ConstraintRow id="row3"/>
+	    <mx:ConstraintRow id="row4"/>
+	    <mx:ConstraintRow id="row5"/>
+	    <mx:ConstraintRow id="row6"/>
+	    <mx:ConstraintRow id="row7"/>
+	</mx:constraintRows>
         
         <mx:Text width="100%" left="col1:0" top="row1:0">
             <mx:htmlText>



Mime
View raw message