Revision: 4703
http://sourceforge.net/p/vexi/code/4703
Author: clrg
Date: 2014-06-18 19:24:28 +0000 (Wed, 18 Jun 2014)
Log Message:
-----------
Fix spans>cols/rows affecting layout
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
2014-06-04 19:03:34 UTC (rev 4702)
+++ branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/lib/layout/grid.t
2014-06-18 19:24:28 UTC (rev 4703)
@@ -334,11 +334,11 @@
/** assign child c to the pack slot specific by col,row */
const assignSlot = function(c, col, row) {
- var c0 = c[0];
+ const c0 = c[0];
c0.v_col = col;
c0.v_row = row;
- var colfrontier = col+c0.colspan;
- var rowfrontier = row+c0.rowspan;
+ const colfrontier = userows ? col+c0.colspan : min(cols,
col+c0.colspan);
+ const rowfrontier = userows ? min(rows, row+c0.rowspan) :
row+c0.rowspan;
// update the number of in-use rows/cols
numcols = max(numcols, colfrontier);
numrows = max(numrows, rowfrontier);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
HPCC Systems Open Source Big Data Platform from LexisNexis Risk Solutions
Find What Matters Most in Your Big Data with HPCC Systems
Open Source. Fast. Scalable. Simple. Ideal for Dirty Data.
Leverages Graph Analysis for Fast Processing & Easy Data Exploration
http://p.sf.net/sfu/hpccsystems
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
