Revision: 4609
http://sourceforge.net/p/vexi/code/4609
Author: clrg
Date: 2013-12-03 02:07:39 +0000 (Tue, 03 Dec 2013)
Log Message:
-----------
Fixes:
- Trap on contentwidth (instead of minwidth)
- Clear up potential memory leak (traps not removed on departing child)
Modified Paths:
--------------
branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/lib/layout/grid.t
Modified:
branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/lib/layout/grid.t
===================================================================
--- branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/lib/layout/grid.t
2013-12-03 01:52:09 UTC (rev 4608)
+++ branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/lib/layout/grid.t
2013-12-03 02:07:39 UTC (rev 4609)
@@ -15,7 +15,7 @@
/** A region is represented primarily by 2 facets
* - the origin i.e. box.col
* - the frontier it affects i.e. box.col+box.colspan
-
+ *
* As multiple boxes may affect the same region, it is
* convenient to group them together with the region
*/
@@ -439,6 +439,7 @@
}
}
+ /** generates a lookup object for frontiers indice, primarily used in
solving */
const getIndice = function(axis) {
const f2i = {};
for (var i,f in axis.frontiers)
@@ -585,9 +586,11 @@
v.rowspan ++= checkInt;
v.display ++= invokePack;
v.maxwidth ++= invokePlaceWidth;
- v.minwidth ++= invokePlaceWidth;
v.maxheight ++= invokePlaceHeight;
- v.minheight ++= invokePlaceHeight;
+ //v.minwidth ++= invokePlaceWidth;
+ //v.minheight ++= invokePlaceWidth;
+ v.contentwidth ++= invokePlaceWidth;
+ v.contentheight ++= invokePlaceHeight;
// we wrap them in an outer box which we can manipulate
var b = v.v_gridbox;
if (b == null) {
@@ -613,7 +616,7 @@
b.Children --= gridboxChildren;
c = b[0];
} else {
- throw "attempt to get null child from a box";
+ throw "Attempt to get null child from a box";
}
if (c) {
c.colspan --= invokePack;
@@ -621,9 +624,15 @@
c.rowspan --= invokePack;
c.rowspan --= checkInt;
c.display --= invokePack;
+ c.maxwidth ++= invokePlaceWidth;
+ c.maxheight ++= invokePlaceHeight;
+ //c.minwidth ++= invokePlaceWidth;
+ //c.minheight ++= invokePlaceWidth;
+ c.contentwidth ++= invokePlaceWidth;
+ c.contentheight ++= invokePlaceHeight;
c.v_gridbox = null;
} else {
- throw "should not happen";
+ throw "Should not happen";
}
// finish removal
$content[trapname] = null;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349351&iu=/4140/ostg.clktrk
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
