Revision: 1897
http://svn.sourceforge.net/vexi/?rev=1897&view=rev
Author: clrg
Date: 2007-06-28 15:37:38 -0700 (Thu, 28 Jun 2007)
Log Message:
-----------
A bunch more Vexi3 porting updates - notably tabpane works well now
Modified Paths:
--------------
widgets/trunk/org.vexi.widgets/src/org/vexi/lib/role/polarizable.t
widgets/trunk/org.vexi.widgets/src/org/vexi/lib/text/block.t
widgets/trunk/org.vexi.widgets/src/org/vexi/lib/text/word.t
widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/list.t
widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/scrollbar.t
widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/scrollpane.t
widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/tabpane.t
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/lib/role/polarizable.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/lib/role/polarizable.t
2007-06-28 21:43:30 UTC (rev 1896)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/lib/role/polarizable.t
2007-06-28 22:37:38 UTC (rev 1897)
@@ -32,6 +32,7 @@
thisbox.pos = "x";
thisbox.shr = "hshrink";
thisbox.flip = static.flip;
+ thisbox.horizontal = true;
thisbox.orient ++= function(v)
{
@@ -43,6 +44,7 @@
mindim = "minwidth";
pos = "x";
shr = "hshrink";
+ horizontal = true;
}
else
{
@@ -51,6 +53,7 @@
mindim = "minheight";
pos = "y";
shr = "vshrink";
+ horizontal = false;
}
}
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/lib/text/block.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/lib/text/block.t
2007-06-28 21:43:30 UTC (rev 1896)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/lib/text/block.t
2007-06-28 22:37:38 UTC (rev 1897)
@@ -12,8 +12,8 @@
</todo>
</meta:doc>
- <ui:box redirect="$content" layout="absolute">
- <ui:box id="content" align="topleft" />
+ <ui:box redirect="$content">
+ <ui:box id="content" align="topleft" layout="absolute" />
thisbox.content = $content;
thisbox.fontheight = vexi.ui.font.height(font, fontsize, "dy");
@@ -309,7 +309,6 @@
{
// assign this word
c[c.numchildren] = nextword;
- nextword.packed = false;
nextword.text = str;
// move onto next word
nextword = trapee.getword;
@@ -324,7 +323,6 @@
if (str != "")
{
c[c.numchildren] = nextword;
- nextword.packed = false;
nextword.text = str;
}
@@ -336,7 +334,6 @@
static.wordFunc = function()
{
var r = vexi..org.vexi.lib.text.word(vexi.box);
- r.packed = false;
r.font = trapee.font;
r.fontsize = trapee.fontsize;
r.parent = trapee.parent;
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/lib/text/word.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/lib/text/word.t 2007-06-28
21:43:30 UTC (rev 1896)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/lib/text/word.t 2007-06-28
22:37:38 UTC (rev 1897)
@@ -12,8 +12,8 @@
</meta:doc>
<ui:box>
- <ui:box id="t" shrink="true" align="bottomleft" text="">
- <ui:box id="o" align="topleft" display="false" fill="darkblue"
hshrink="true" packed="false" textcolor="white" />
+ <ui:box id="t" shrink="true" align="bottomleft" text=""
layout="absolute">
+ <ui:box id="o" align="topleft" display="false" fill="darkblue"
hshrink="true" textcolor="white" />
</ui:box>
thisbox.align = "topleft"; // must set this before assigning traps
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/list.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/list.t
2007-06-28 21:43:30 UTC (rev 1896)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/list.t
2007-06-28 22:37:38 UTC (rev 1897)
@@ -5,5 +5,5 @@
<author>Charles Goodwin</author>
</meta:doc>
- <list cols="1" />
+ <list orient="vertical" />
</vexi>
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/scrollbar.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/scrollbar.t
2007-06-28 21:43:30 UTC (rev 1896)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/scrollbar.t
2007-06-28 22:37:38 UTC (rev 1897)
@@ -10,9 +10,9 @@
<button id="back" fill="#d4d0c8" width="16" height="16" repeats="true"
shrink="true">
<ui:box id="backimg" shrink="true" />
</button>
- <role:clickable id="track" enabled="true" fill=".image.scrollbg"
repeats="true">
- <ui:box id="shadow" align="topleft" fill="#888888" packed="false"
display="false" />
- <bevel id="thumb" align="topleft" form="up" packed="false">
+ <role:clickable id="track" enabled="true" fill=".image.scrollbg"
layout="absolute" repeats="true">
+ <ui:box id="shadow" align="topleft" fill="#888888" display="false"
/>
+ <bevel id="thumb" align="topleft" form="up">
<ui:box fill="#d4d0c8" />
</bevel>
</role:clickable>
@@ -34,7 +34,7 @@
thisbox[shr] = false;
thisbox[flip(shr)] = true;
- if (rows)
+ if (horizontal)
{
$backimg.fill = .image.arrowleft;
$nextimg.fill = .image.arrowright;
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/scrollpane.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/scrollpane.t
2007-06-28 21:43:30 UTC (rev 1896)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/scrollpane.t
2007-06-28 22:37:38 UTC (rev 1897)
@@ -6,17 +6,21 @@
</meta:doc>
<lib:scrollpane redirect="$content">
- <ui:box rows="2">
- <ui:box id="view">
- <ui:box id="content" align="topleft" packed="false" />
+ <ui:box>
+ <ui:box orient="vertical">
+ <ui:box id="view" layout="absolute">
+ <ui:box id="content" align="topleft" />
+ </ui:box>
+ <ui:box vshrink="true" >
+ <scrollbar id="hscroll" orient="horizontal" />
+ </ui:box>
</ui:box>
- <ui:box vshrink="true" >
- <scrollbar id="hscroll" orient="horizontal" />
+ <ui:box orient="vertical">
+ <ui:box hshrink="true" >
+ <scrollbar id="vscroll" orient="vertical" />
+ </ui:box>
+ <ui:box id="inset" />
</ui:box>
- <ui:box hshrink="true" >
- <scrollbar id="vscroll" orient="vertical" />
- </ui:box>
- <ui:box id="inset" />
</ui:box>
thisbox.th_hscroll = $hscroll;
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/tabpane.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/tabpane.t
2007-06-28 21:43:30 UTC (rev 1896)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/tabpane.t
2007-06-28 22:37:38 UTC (rev 1897)
@@ -49,13 +49,10 @@
/** sync shadow with currently selected tab - show.v_tab */
var syncShadow = function(v)
{
- $shadow.width =
- vexi.math.max(0,
- vexi.math.min(show.v_tab.width-3,
- vexi.math.min($headwrap.width-(show.v_tab.x+$head.x),
- show.v_tab.x+show.v_tab.width+$head.x)));
- $shadow.x = vexi.math.max($headwrap.x,
$headwrap.x+$head.x+show.v_tab.x+1);
- $shadow.y = $head.height;
+ var dx = $wrap.distanceto(show.v_tab).x;
+ $shadow.x = dx + 1;
+ $shadow.y = $wrap.height;
+ $shadow.width = vexi.math.max(0, vexi.math.min(width - dx,
show.v_tab.width) - 3);
}
/** trap function to fire syncShadow */
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 DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
