[Vexi-svn] SF.net SVN: vexi:[3808] trunk/widgets/org.vexi.widgets/src
Revision: 3808
http://vexi.svn.sourceforge.net/vexi/?rev=3808view=rev
Author: clrg
Date: 2010-02-26 13:20:47 + (Fri, 26 Feb 2010)
Log Message:
---
Clean up
Modified Paths:
--
trunk/widgets/org.vexi.widgets/src/org/vexi/lib/layout/aspect.t
trunk/widgets/org.vexi.widgets/src/org/vexi/lib/role/popupmanager.t
trunk/widgets/org.vexi.widgets/src_dev/visualtest/layout/aspect.t
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/lib/layout/aspect.t
===
--- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/layout/aspect.t
2010-02-26 11:35:35 UTC (rev 3807)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/lib/layout/aspect.t
2010-02-26 13:20:47 UTC (rev 3808)
@@ -3,12 +3,6 @@
vexi xmlns:ui=vexi://ui xmlns:meta=vexi://meta xmlns:util=vexi.util
meta:doc
authorCharles Goodwin/author
-todo
-* border-left/right/top/bottom
-* take more than one argument to border like CSS
-* depth read function when border is image based
-* depth should be read-only with image borders
-/todo
/meta:doc
ui:box redirect=:$content
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/lib/role/popupmanager.t
===
--- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/role/popupmanager.t
2010-02-26 11:35:35 UTC (rev 3807)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/lib/role/popupmanager.t
2010-02-26 13:20:47 UTC (rev 3808)
@@ -71,11 +71,12 @@
$container.display = popcount0;
// use default group if none is specified
var g = p.popgroup ? p.popgroup : default;
-//vexi.trace(popcount--: +popcount+ (+g+));
-if (popforegs[g])
- popforegs[g].display = false;
-if (popgroups[g])
- popgroups[g] = null;
+if (popforegs[g]) {
+popforegs[g].display = false;
+}
+if (popgroups[g]) {
+popgroups[g] = null;
+}
}
/** private function to pop up box 'v' */
@@ -112,7 +113,6 @@
// handle container display
if (p.display) {
popcount++;
-//vexi.trace(popcount++: +popcount+ (+g+));
$container.display = popcount0;
if (p.visible) {
p.surface_x ++= syncXPos;
@@ -175,7 +175,7 @@
if (popforegs[g]) {
// if group exists slot into it
-popforegs[g][popforegs[g].numchildren] = p;
+popforegs[g].add(p);
} else {
// initialize new group, especially its foreground box
@@ -198,13 +198,6 @@
}
}
$container[n] = fg;
-
-// simple cleanup on frame close (slowdown Vexi leaks)
-//surface.frame.Close ++= function(v) {
-//cascade = v;
-//popforegs[g] = null;
-//$container[n] = null;
-//}
}
}
@@ -248,9 +241,9 @@
surface.frame.Focused ++= function(v) {
cascade = v;
if (!v) {
-for (var key in popgroups) {
-if (popgroups[key] and !popgroups[key].ignorefocusloss) {
-popgroups[key].v_popmaster.popdown = true;
+for (var key,grp in popgroups) {
+if (grp and !grp.ignorefocusloss) {
+grp.v_popmaster.popdown = true;
}
}
}
Modified: trunk/widgets/org.vexi.widgets/src_dev/visualtest/layout/aspect.t
===
--- trunk/widgets/org.vexi.widgets/src_dev/visualtest/layout/aspect.t
2010-02-26 11:35:35 UTC (rev 3807)
+++ trunk/widgets/org.vexi.widgets/src_dev/visualtest/layout/aspect.t
2010-02-26 13:20:47 UTC (rev 3808)
@@ -20,4 +20,4 @@
vexi.ui.frame = thisbox;
/ui:box
-/vexi
\ No newline at end of file
+/vexi
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Download Intel#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
___
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
[Vexi-svn] SF.net SVN: vexi:[3809] trunk/widgets/org.vexi.widgets/src/vexi/util/date.t
Revision: 3809
http://vexi.svn.sourceforge.net/vexi/?rev=3809view=rev
Author: clrg
Date: 2010-02-26 14:34:35 + (Fri, 26 Feb 2010)
Log Message:
---
Allow shorter date strings e.g. 1 or 2 numbers
Modified Paths:
--
trunk/widgets/org.vexi.widgets/src/vexi/util/date.t
Modified: trunk/widgets/org.vexi.widgets/src/vexi/util/date.t
===
--- trunk/widgets/org.vexi.widgets/src/vexi/util/date.t 2010-02-26 13:20:47 UTC
(rev 3808)
+++ trunk/widgets/org.vexi.widgets/src/vexi/util/date.t 2010-02-26 14:34:35 UTC
(rev 3809)
@@ -206,25 +206,26 @@
for (var c = v.charCodeAt(i); c57 or 48c; c = v.charCodeAt(++i))
{ /* skip non-numbers */ }
for (var c = v.charCodeAt(i); m3j and c47 and 58c; c =
v.charCodeAt(++i)) s2 = s2 + v.charAt(i);
} catch (e) { throw unsupported text value for datefield: '+v+'; }
+var d = !s0 or !s1 or !s2 ? vexi.date() : null;
// assign values to widget
switch (format) {
case MMDD:
-s0 = vexi.string.parseInt(s0, 10);
-s1 = vexi.string.parseInt(s1, 10);
-s2 = expandYear(s2);
+s0 = s0 ? vexi.string.parseInt(s0, 10) : d.getMonth();
+s1 = s1 ? vexi.string.parseInt(s1, 10) : d.getDay();
+s2 = s2 ? expandYear(s2) : d.getYear();
o.day = s1; o.month = s0; o.year = s2;
break;
case MMDD:
-s0 = expandYear(s0);
-s1 = vexi.string.parseInt(s1, 10);
-s2 = vexi.string.parseInt(s2, 10);
+s0 = s0 ? expandYear(s0) : d.getYear();
+s1 = s1 ? vexi.string.parseInt(s1, 10) : d.getMonth();
+s2 = s2 ? vexi.string.parseInt(s2, 10) : d.getDay();
o.day = s2; o.month = s1; o.year = s0;
break;
case DDMM:
default:
-s0 = vexi.string.parseInt(s0, 10);
-s1 = vexi.string.parseInt(s1, 10);
-s2 = expandYear(s2);
+s0 = s0 ? vexi.string.parseInt(s0, 10) : d.getDay();
+s1 = s1 ? vexi.string.parseInt(s1, 10) : d.getMonth();
+s2 = s2 ? expandYear(s2) : d.getYear();
o.day = s0; o.month = s1; o.year = s2;
break;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Download Intel#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
___
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
[Vexi-svn] SF.net SVN: vexi:[3810] trunk/widgets/org.vexi.widgets/src/org/vexi/theme/ classic/tablist.t
Revision: 3810
http://vexi.svn.sourceforge.net/vexi/?rev=3810view=rev
Author: clrg
Date: 2010-02-26 15:45:38 + (Fri, 26 Feb 2010)
Log Message:
---
Fix tablist doubling up on list implementation + tidy up
Modified Paths:
--
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/tablist.t
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/tablist.t
===
--- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/tablist.t
2010-02-26 14:34:35 UTC (rev 3809)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/tablist.t
2010-02-26 15:45:38 UTC (rev 3810)
@@ -9,18 +9,16 @@
/meta:doc
lib:option /
-lay:margin redirect=:$proxy margin=3 maxlistheight=160
shrink=true
+lay:margin redirect=:$content margin=3 maxlistheight=160
shrink=true
button id=button width=18 minheight=18
ui:box fill=#d4d0c8 layout=layer
ui:box id=arrow fill=:.image.arrowdown shrink=true /
/ui:box
/button
-!-- always hidden --
-ui:box id=proxy display=false /
-!-- moved elsewhere --
+!-- our popox --
lay:border id=popbox border=black depth=1
scrollpane id=scroll autohide=true
fill=:.settings..surfacefill hshrink=true scrollhorizontal=false
-wi:list id=content fill=white shrink=true /
+ui:box id=content fill=white shrink=true /
/scrollpane
/lay:border
@@ -44,19 +42,16 @@
/** grow content scrollpane */
$content.height ++= function(v) {
// FIXME: this is all a bit of a hack really - do it properly
-if (!popped) { cascade = v; return true; }
+if (!popped) {
+cascade = v;
+return;
+}
var surf =
surface.frame.height-surface.frame.distanceto($popbox).y;
surf = maxlistheightsurf ? surf : maxlistheight;
$scroll.minheight = vsurf ? surf : v;
cascade = v;
}
-/** move proxy children to $popbox children */
-$proxy.Children ++= function(v) { $content[trapname] = v; return; }
-$proxy.Children ++= function() { return $content[trapname]; }
-$proxy.indexof ++= function() { return $content.indexof; }
-$proxy.numchildren ++= function() { return $content.numchildren; }
-
thisbox.surfaceWidth = function(dx, sw) {
v_popbox.surface_x = vexi.math.max(0, dx-v_popbox.width+width-3);
}
@@ -68,8 +63,9 @@
v_popbox.width ++= function(v) {
cascade = v;
var s = surface;
-if (s==null) return;
-surfaceWidth(s.frame.distanceto(thisbox).x, s.frame.width);
+if (s!=null) {
+surfaceWidth(s.frame.distanceto(thisbox).x, s.frame.width);
+}
}
/lay:margin
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Download Intel#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
___
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
[Vexi-svn] SF.net SVN: vexi:[3811] trunk/widgets/org.vexi.widgets/src/org/vexi/lib
Revision: 3811
http://vexi.svn.sourceforge.net/vexi/?rev=3811view=rev
Author: clrg
Date: 2010-02-26 15:47:08 + (Fri, 26 Feb 2010)
Log Message:
---
Clean up
Modified Paths:
--
trunk/widgets/org.vexi.widgets/src/org/vexi/lib/role/selectcontainer.t
trunk/widgets/org.vexi.widgets/src/org/vexi/lib/text/edit.t
trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/option.t
trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/tabpane.t
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/lib/role/selectcontainer.t
===
--- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/role/selectcontainer.t
2010-02-26 15:45:38 UTC (rev 3810)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/lib/role/selectcontainer.t
2010-02-26 15:47:08 UTC (rev 3811)
@@ -86,12 +86,13 @@
return;
}
t.v_listgroup = g;
-// keep selected in view if a scrolling widget
-if (trapee.th_scroll) {
+
+if (trapee.syncView) {
+// keep selected in view if a scrolling widget
g.selected ++= trapee.syncView;
}
-// respect selected state of c
if (c.selected) {
+// respect selected state of c
t.v_listgroup.selected = c;
}
}
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/lib/text/edit.t
===
--- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/text/edit.t 2010-02-26
15:45:38 UTC (rev 3810)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/lib/text/edit.t 2010-02-26
15:47:08 UTC (rev 3811)
@@ -1635,8 +1635,7 @@
while (thisbox[numblocks]) thisbox[numblocks] = null;
// singleline
-}
-else {
+} else {
thisbox[0].text = t;
thisbox[0].font = font;
thisbox[0].fontsize = fontsize;
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/option.t
===
--- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/option.t
2010-02-26 15:45:38 UTC (rev 3810)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/option.t
2010-02-26 15:47:08 UTC (rev 3811)
@@ -49,7 +49,7 @@
static.selecteditemRead = function() {
return trapee.v_listgroup?.selected;
-};
+};
static.listgroupWrite = function(v) {
var g = trapee.v_listgroup;
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/tabpane.t
===
--- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/tabpane.t
2010-02-26 15:45:38 UTC (rev 3810)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/tabpane.t
2010-02-26 15:47:08 UTC (rev 3811)
@@ -168,11 +168,11 @@
th_head[trapname] = t;
// tab overflow policy
if (!c.v_tabitem) {
-var i = newitem(vexi.box);
+var i = new newitem();
i.text = c.tabtext;
i.value = c;
c.v_tabitem = i;
-th_tablist[th_tablist.numchildren] = i;
+th_tablist.add(i);
}
}
// clean up tabs
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
Download Intel#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
___
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
