Revision: 2530 http://vexi.svn.sourceforge.net/vexi/?rev=2530&view=rev Author: clrg Date: 2007-10-29 14:54:48 -0700 (Mon, 29 Oct 2007)
Log Message: ----------- Remove warnings and make table/tree code more robust Modified Paths: -------------- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/cell.t trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/column.t trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/row.t trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/table.t trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/tree.t trunk/widgets/org.vexi.widgets/src/org/vexi/theme/win2k/cell.t trunk/widgets/org.vexi.widgets/src/org/vexi/theme/win2k/column.t Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/cell.t =================================================================== --- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/cell.t 2007-10-29 21:54:08 UTC (rev 2529) +++ trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/cell.t 2007-10-29 21:54:48 UTC (rev 2530) @@ -28,8 +28,8 @@ static.valueWrite = function(v) { var colh = trapee.v_head; var cell = trapee; + cascade = v; if (typeof(v) == "date") { - cascade = v; if (colh.datatype == "day") cell.text = day[cascade]; else if (colh.datatype == "date") Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/column.t =================================================================== --- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/column.t 2007-10-29 21:54:08 UTC (rev 2529) +++ trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/column.t 2007-10-29 21:54:48 UTC (rev 2530) @@ -10,6 +10,7 @@ thisbox.fixedwidth = false; thisbox.resizeable = false; thisbox.sort = null; + thisbox.th_content = null; thisbox.value = null; value ++= static.valueRead; Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/row.t =================================================================== --- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/row.t 2007-10-29 21:54:08 UTC (rev 2529) +++ trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/row.t 2007-10-29 21:54:48 UTC (rev 2530) @@ -6,10 +6,22 @@ </meta:doc> <ui:box> + + thisbox.selected = false; + thisbox.rowfill ++= static.rowfillWrite; thisbox.value ++= static.valueWrite; + thisbox.v_head ++= static.v_headWrite; + </ui:box> + /** automatically set cell.v_head */ + static.v_headWrite = function(v) { + cascade = v; + var n = trapee.numchildren; + for (var i=0; n>i; i++) trapee[i].v_head = v; + } + /** set the default fill for this row */ static.rowfillWrite = function(v) { cascade = v; Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/table.t =================================================================== --- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/table.t 2007-10-29 21:54:08 UTC (rev 2529) +++ trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/table.t 2007-10-29 21:54:48 UTC (rev 2530) @@ -78,7 +78,6 @@ var createRow = function() { var r = rowtemplate(vexi.box); - r.v_head = th_head; return r; } @@ -283,6 +282,15 @@ th_bodyview[0] = c; th_body.selected ++= scrollWrite; + /** assign v_head automatically */ + c.Children ++= function(r) { + if (r) r.v_head = th_head; + var _r = trapee[trapname]; + if (_r) _r.v_head = null; + cascade = r; + } + + /** for access to the table's internal dimensions */ v.getPortHeight = function() { return th_bodyport.height; } thisbox.loadData = loadDataFunc; Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/tree.t =================================================================== --- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/tree.t 2007-10-29 21:54:08 UTC (rev 2529) +++ trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/tree.t 2007-10-29 21:54:48 UTC (rev 2530) @@ -82,9 +82,6 @@ // remove from this tree if (r.v_is_tree) { // FIXME: split groups - r.v_self.groupref = null; - r.v_self.nexttree --= nexttreeChildRead; - r.v_self.prevtree --= prevtreeChildRead; } } cascade = c; Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/win2k/cell.t =================================================================== --- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/win2k/cell.t 2007-10-29 21:54:08 UTC (rev 2529) +++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/win2k/cell.t 2007-10-29 21:54:48 UTC (rev 2530) @@ -1,6 +1,7 @@ <!-- Copyright 2007 - see COPYING for details [LGPL] --> -<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta" xmlns="org.vexi.lib.widget"> +<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta" xmlns="org.vexi.lib.widget" + xmlns:theme="vexi.theme"> <meta:doc> <author>Charles Goodwin</author> </meta:doc> Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/win2k/column.t =================================================================== --- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/win2k/column.t 2007-10-29 21:54:08 UTC (rev 2529) +++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/win2k/column.t 2007-10-29 21:54:48 UTC (rev 2530) @@ -13,7 +13,7 @@ <lib:column /> <ui:box redirect=":$content" padding="2 1"> <button id="b" layout="place"> - <ui:box align="center"> + <ui:box align="left"> <ui:box id="sort" align="right" shrink="true" width="8" /> <ui:box id="content" /> <ui:box id="spacer" shrink="true" width="8" /> @@ -43,7 +43,7 @@ $b.minheight = h; } - th_content ++= function(v) { + thisbox.th_content ++= function(v) { v.font ++= syncSize; v.fontsize ++= syncSize; v.fontsize = v.fontsize; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Vexi-svn mailing list Vexi-svn@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/vexi-svn