Revision: 4790 http://sourceforge.net/p/vexi/code/4790 Author: clrg Date: 2015-05-05 00:28:27 +0000 (Tue, 05 May 2015) Log Message: ----------- Add testcase for margin/padding layout + fix for contentsize test
Modified Paths: -------------- branches/vexi3_integrated_layout/org.vexi-core.main/src/main/jpp/org/vexi/core/Box.jpp branches/vexi3_integrated_layout/org.vexi-core.main/src/test/java/test/core/box/layout/contentsize.t branches/vexi3_integrated_layout/org.vexi-core.main/src/test/java/test/core/box/layout/layout2.t Added Paths: ----------- branches/vexi3_integrated_layout/org.vexi-core.main/src/test/java/test/core/box/layout/layout3.t branches/vexi3_integrated_layout/org.vexi-core.main/src/test/java/test/core/box/layout/lib/ branches/vexi3_integrated_layout/org.vexi-core.main/src/test/java/test/core/box/layout/lib/layout3_structure.t Modified: branches/vexi3_integrated_layout/org.vexi-core.main/src/main/jpp/org/vexi/core/Box.jpp =================================================================== --- branches/vexi3_integrated_layout/org.vexi-core.main/src/main/jpp/org/vexi/core/Box.jpp 2015-05-04 16:16:14 UTC (rev 4789) +++ branches/vexi3_integrated_layout/org.vexi-core.main/src/main/jpp/org/vexi/core/Box.jpp 2015-05-05 00:28:27 UTC (rev 4790) @@ -650,8 +650,8 @@ return; } constrain(); - int w = test(HSHRINK) ? nominalWidth() : min(maxwidth, max(contentwidth, width)); - int h = test(VSHRINK) ? nominalHeight() : min(maxheight, max(contentheight, height)); + int w = test(HSHRINK) ? nominalWidth() : maxwidth; + int h = test(VSHRINK) ? nominalHeight() : maxheight; tryResize(w, h, true); place(test(PLACE_CLEAN)); } Modified: branches/vexi3_integrated_layout/org.vexi-core.main/src/test/java/test/core/box/layout/contentsize.t =================================================================== --- branches/vexi3_integrated_layout/org.vexi-core.main/src/test/java/test/core/box/layout/contentsize.t 2015-05-04 16:16:14 UTC (rev 4789) +++ branches/vexi3_integrated_layout/org.vexi-core.main/src/test/java/test/core/box/layout/contentsize.t 2015-05-05 00:28:27 UTC (rev 4790) @@ -2,7 +2,9 @@ var testContentx = function(dim){ var c1 = vexi.box; - c1["min"+dim]=10; + var c2 = vexi.box; + c2["min"+dim]=10; + c1[0] = c2; c1.discover(); .util..assertEquals(10,c1["content"+dim]); @@ -11,7 +13,7 @@ x = v; cascade = v; }; - c1["min"+dim]=20; + c2["min"+dim]=20; c1.discover(); .util..assertEquals(20,x); }; Modified: branches/vexi3_integrated_layout/org.vexi-core.main/src/test/java/test/core/box/layout/layout2.t =================================================================== --- branches/vexi3_integrated_layout/org.vexi-core.main/src/test/java/test/core/box/layout/layout2.t 2015-05-04 16:16:14 UTC (rev 4789) +++ branches/vexi3_integrated_layout/org.vexi-core.main/src/test/java/test/core/box/layout/layout2.t 2015-05-05 00:28:27 UTC (rev 4790) @@ -13,8 +13,12 @@ { // reported core layout failure var a = vexi.box; a.width = max-5; + a.name = "foo"; a[0] = vexi.box; a.discover(); + trace(max); + trace(a.width); + trace(a[0].width); assert(a[0].width==max-5); } Added: branches/vexi3_integrated_layout/org.vexi-core.main/src/test/java/test/core/box/layout/layout3.t =================================================================== --- branches/vexi3_integrated_layout/org.vexi-core.main/src/test/java/test/core/box/layout/layout3.t (rev 0) +++ branches/vexi3_integrated_layout/org.vexi-core.main/src/test/java/test/core/box/layout/layout3.t 2015-05-05 00:28:27 UTC (rev 4790) @@ -0,0 +1,12 @@ +<vexi xmlns:ui="vexi://ui" xmlns="" xmlns:lib="_lib"> + + var p = new .lib.layout3_structure(); + p.shrink = true; + p.discover(); + trace(p.contentwidth); + trace(p.contentheight); + lib..assertSize(420,280,p); + + // see layout3_structure + <ui:Box /> +</vexi> Added: branches/vexi3_integrated_layout/org.vexi-core.main/src/test/java/test/core/box/layout/lib/layout3_structure.t =================================================================== --- branches/vexi3_integrated_layout/org.vexi-core.main/src/test/java/test/core/box/layout/lib/layout3_structure.t (rev 0) +++ branches/vexi3_integrated_layout/org.vexi-core.main/src/test/java/test/core/box/layout/lib/layout3_structure.t 2015-05-05 00:28:27 UTC (rev 4790) @@ -0,0 +1,19 @@ +<vexi xmlns:ui="vexi://ui" xmlns="" xmlns:lib="_lib"> + <ui:Box fill="white"> + <ui:Box shrink="true" fill="black" margin="10" padding="10"> + <ui:Box fill="white"> + <ui:Box fill="red" minwidth="50" minheight="50" margin="10" /> + <ui:Box fill="blue" minwidth="50" minheight="50" margin="20" /> + <ui:Box fill="green" minwidth="50" minheight="50" margin="30" /> + </ui:Box> + </ui:Box> + + <ui:Box shrink="true" fill="black" margin="10" padding="10" orient="vertical"> + <ui:Box fill="white" orient="vertical"> + <ui:Box fill="red" minwidth="50" minheight="50" margin="30" /> + <ui:Box fill="blue" minwidth="50" minheight="50" margin="20" /> + <ui:Box fill="green" minwidth="50" minheight="50" margin="10" /> + </ui:Box> + </ui:Box> + </ui:Box> +</vexi> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ One dashboard for servers and applications across Physical-Virtual-Cloud Widest out-of-the-box monitoring support with 50+ applications Performance metrics, stats and reports that give you Actionable Insights Deep dive visibility with transaction tracing using APM Insight. http://ad.doubleclick.net/ddm/clk/290420510;117567292;y _______________________________________________ Vexi-svn mailing list Vexi-svn@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/vexi-svn