Revision: 3979
http://vexi.svn.sourceforge.net/vexi/?rev=3979&view=rev
Author: clrg
Date: 2010-12-21 03:06:41 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
Update to use reflow() instead of forcereflow() and reconcile prior reflow
references
Modified Paths:
--------------
trunk/org.vexi-vexi.guide/src_main/org/vexi/guide/board.t
trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/text/block.t
trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/text/edit.t
trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/text/field.t
trunk/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/menu.t
trunk/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/option.t
trunk/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/submenu.t
trunk/org.vexi-vexi.widgets/src_test/test/layout/grid_columns.t
trunk/org.vexi-vexi.widgets/src_test/test/layout/testgrid.t
trunk/org.vexi-vexi.widgets/src_test/test/widget/combo.t
trunk/org.vexi-vexi.widgets/src_test/test/widget/table_fetchdata.t
Modified: trunk/org.vexi-vexi.guide/src_main/org/vexi/guide/board.t
===================================================================
--- trunk/org.vexi-vexi.guide/src_main/org/vexi/guide/board.t 2010-12-21
03:04:20 UTC (rev 3978)
+++ trunk/org.vexi-vexi.guide/src_main/org/vexi/guide/board.t 2010-12-21
03:06:41 UTC (rev 3979)
@@ -178,7 +178,7 @@
if (!enabled) return;
trapee.display = false;
trapee.object.display = false;
- $canvas.forcereflow();
+ $canvas.reflow();
var i = { object: trapee.object };
model.insert = i;
trapee.Leave --= callee;
Modified: trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/text/block.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/text/block.t
2010-12-21 03:04:20 UTC (rev 3978)
+++ trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/text/block.t
2010-12-21 03:06:41 UTC (rev 3979)
@@ -54,7 +54,7 @@
thisbox.fontsize ++= static.propagateOnWrite;
thisbox.multiline ++= static.multilineWrite;
thisbox.edit ++= static.propagateOnWrite;
- thisbox.reflow ++= static.invokeReflow;
+ thisbox.reflowbox++= static.invokeReflow;
thisbox.textalign ++= static.invokeReflow;
thisbox.textalign ++= static.textalignWrite;
thisbox.text ++= static.textRead;
@@ -253,7 +253,7 @@
trapee.width --= static.invokeReflow;
}
- trapee.reflow = true;
+ trapee.reflowbox = true;
}
/** trap to set the textual alignment of this block */
Modified: trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/text/edit.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/text/edit.t
2010-12-21 03:04:20 UTC (rev 3978)
+++ trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/text/edit.t
2010-12-21 03:06:41 UTC (rev 3979)
@@ -1375,7 +1375,7 @@
}
}
thisbox[cbInd+1] = nblock;
- cBlock.reflow = true;
+ cBlock.reflowbox = true;
// cBlock.reflow called at the end of KeyPressed
// so no need to reflow nblock(cBlock) manually
cBlock = nblock;
@@ -1563,7 +1563,7 @@
}
}
- cBlock.reflow = true;
+ cBlock.reflowbox = true;
syncCursorAndOffset(false);
return true;
}
Modified: trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/text/field.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/text/field.t
2010-12-21 03:04:20 UTC (rev 3978)
+++ trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/text/field.t
2010-12-21 03:06:41 UTC (rev 3979)
@@ -187,7 +187,7 @@
static.visibleWrite = function(v) {
cascade = v;
if (v) {
- trapee.forcereflow();
+ trapee.reflow();
}
}
Modified: trunk/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/menu.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/menu.t
2010-12-21 03:04:20 UTC (rev 3978)
+++ trunk/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/menu.t
2010-12-21 03:06:41 UTC (rev 3979)
@@ -44,7 +44,7 @@
var t = trapee;
var d = t.surface.frame.distanceto(t);
t.form = "thindown";
- t.v_popbox.forcereflow();
+ t.v_popbox.reflow();
var w = t.v_popbox.width;
t.v_popbox.surface_x = d.x + w > t.surface.frame.width ? d.x + t.width
- w : d.x;
t.v_popbox.surface_y = d.y + t.height;
Modified: trunk/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/option.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/option.t
2010-12-21 03:04:20 UTC (rev 3978)
+++ trunk/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/option.t
2010-12-21 03:06:41 UTC (rev 3979)
@@ -133,17 +133,17 @@
trapee.p_option.th_focus.minwidth = v;
}
- /** need to forcereflow for it to work */
+ /** need to invoke reflow for it to work */
static.childWrite = function(v) {
cascade = v;
- trapee.forcereflow();
+ trapee.reflow();
}
- /** need to forcereflow for it to work */
+ /** need to invoke reflow for it to work */
static.visibleWrite = function(v) {
cascade = v;
if (v) {
- trapee.v_popbox.forcereflow();
+ trapee.v_popbox.reflow();
trapee.v_content.Children ++= static.childWrite;
} else {
trapee.v_content.Children --= static.childWrite;
Modified: trunk/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/submenu.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/submenu.t
2010-12-21 03:04:20 UTC (rev 3978)
+++ trunk/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/submenu.t
2010-12-21 03:06:41 UTC (rev 3979)
@@ -41,7 +41,7 @@
static.popupWrite = function(v) {
var t = trapee;
var d = t.surface.frame.distanceto(t);
- t.v_popbox.forcereflow();
+ t.v_popbox.reflow();
var w = t.v_popbox.width;
// if there is not enough space to the right and enough space to the
left
// place the submenu in the available space, otherwise place to the
right
Modified: trunk/org.vexi-vexi.widgets/src_test/test/layout/grid_columns.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_test/test/layout/grid_columns.t
2010-12-21 03:04:20 UTC (rev 3978)
+++ trunk/org.vexi-vexi.widgets/src_test/test/layout/grid_columns.t
2010-12-21 03:06:41 UTC (rev 3979)
@@ -87,7 +87,7 @@
assertHeight(100, b[5]);
b[6].display = true;
b[7].display = true;
- b.forcereflow();
+ b.reflow();
assertSlot(0,3, b[6]);
assertSlot(0,4, b[7]);
assertWidth(100, b[6]);
Modified: trunk/org.vexi-vexi.widgets/src_test/test/layout/testgrid.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_test/test/layout/testgrid.t 2010-12-21
03:04:20 UTC (rev 3978)
+++ trunk/org.vexi-vexi.widgets/src_test/test/layout/testgrid.t 2010-12-21
03:06:41 UTC (rev 3979)
@@ -34,7 +34,7 @@
b[2] = newBox(0,0);
b[3] = newBox(30,10);
b.shrink=true;
- b.forcereflow();
+ b.reflow();
assertSize(20,20,b[0]);
assertSize(30,20,b[1]);
assertSize(20,10,b[2]);
Modified: trunk/org.vexi-vexi.widgets/src_test/test/widget/combo.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_test/test/widget/combo.t 2010-12-21
03:04:20 UTC (rev 3978)
+++ trunk/org.vexi-vexi.widgets/src_test/test/widget/combo.t 2010-12-21
03:06:41 UTC (rev 3979)
@@ -12,8 +12,8 @@
var b = .combo(vexi.box);
var i1 = .item(vexi.box); i1.text="An A"; i1.value="A";
var i2 = .item(vexi.box); i2.text="B";
- b[0] = i1; i1.forcereflow();
- b[0] = i2; i2.forcereflow();
+ b[0] = i1; i1.reflow();
+ b[0] = i2; i2.reflow();
assertEq("",b.text);
assertEq(null,b.value);
@@ -39,7 +39,7 @@
// simulate mouse interaction
b.focused = true;
b.popup = true;
- i1.sendEvent("Move",1,1); // set MOUSEINSIDE
+ i1.inputevent("Move",1,1); // set MOUSEINSIDE
// value not yet assigned
assertEq("B",b.text);
assertEq("B",b.value);
@@ -47,13 +47,13 @@
i1.action = true;
b.popdown = true;
b.focused = false;
- i1.sendEvent("Move",-1,-1); // set !MOUSEINSIDE
+ i1.inputevent("Move",-1,-1); // set !MOUSEINSIDE
assertEq("An A",b.text);
assertEq("A",b.value);
/* FIXME: failing to replicate user interaction
// select with mouse+tab
b.popup = true;
- i2.sendEvent("Move",1,1); // set MOUSEINSIDE
+ i2.inputevent("Move",1,1); // set MOUSEINSIDE
b.focused = false;
b.popdown = true;
assertEq("B",b.text);
Modified: trunk/org.vexi-vexi.widgets/src_test/test/widget/table_fetchdata.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_test/test/widget/table_fetchdata.t
2010-12-21 03:04:20 UTC (rev 3978)
+++ trunk/org.vexi-vexi.widgets/src_test/test/widget/table_fetchdata.t
2010-12-21 03:06:41 UTC (rev 3979)
@@ -49,7 +49,7 @@
//move to end of table
table.th_bodyview.y =
table.th_bodyport.height-table.th_bodyview.height;
table.forceFetchData();
- table.th_body.forcereflow();
+ table.th_body.reflow();
vexi.log.info(table.th_bodyview.y);
var last = table.th_body[table.th_body.numchildren-1];
var bottom = last.y+last.height;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
