Revision: 4058
          http://vexi.svn.sourceforge.net/vexi/?rev=4058&view=rev
Author:   clrg
Date:     2011-03-20 23:38:57 +0000 (Sun, 20 Mar 2011)

Log Message:
-----------
Fix #40 - display=false boxes causing exceptions in grid logic

Modified Paths:
--------------
    trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/layout/grid.t

Modified: trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/layout/grid.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/layout/grid.t     
2011-03-20 22:52:04 UTC (rev 4057)
+++ trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/layout/grid.t     
2011-03-20 23:38:57 UTC (rev 4058)
@@ -90,6 +90,8 @@
                 sizes = [0];
                 for (c = colregions.mark(); c != null; c = colregions.next()) {
                     c0 = c[0];
+                    // bypass hidden children
+                    if (!c0.display) continue;
                     r1 = rindmap[c0.v_col];
                     r2 = rindmap[c0.v_col+c0.colspan];
                     if (r2 == null) {
@@ -226,6 +228,8 @@
                 sizes = [0];
                 for (c = rowregions.mark(); c != null; c = rowregions.next()) {
                     c0 = c[0];
+                    // bypass hidden children
+                    if (!c0.display) continue;
                     r1 = rindmap[c0.v_row];
                     r2 = rindmap[c0.v_row+c0.rowspan];
                     // first to affect this region
@@ -730,6 +734,7 @@
                     c.colspan --= checkInt;
                     c.rowspan --= invokePack;
                     c.rowspan --= checkInt;
+                    c.display --= invokePack;
                     c.v_gridbox = null;
                 } else {
                     throw "should not happen";


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn

Reply via email to