Revision: 1896
http://svn.sourceforge.net/vexi/?rev=1896&view=rev
Author: clrg
Date: 2007-06-28 14:43:30 -0700 (Thu, 28 Jun 2007)
Log Message:
-----------
The demo now loads! :-)
But it is very broken! :-(
Modified Paths:
--------------
widgets/trunk/org.vexi.widgets/src/org/vexi/lib/widget/cardpane.t
widgets/trunk/org.vexi.widgets/src/org/vexi/lib/widget/tabpane.t
widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/tab.t
widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/tabpane.t
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/lib/widget/cardpane.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/lib/widget/cardpane.t
2007-06-28 21:29:03 UTC (rev 1895)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/lib/widget/cardpane.t
2007-06-28 21:43:30 UTC (rev 1896)
@@ -42,18 +42,19 @@
th_content ++= function(v)
{
// childadded write trap
- v.ChildAdded ++= function(c)
+ v.Children ++= function(c)
{
- // show c if it is the first card
- if (v.numchildren > 1) c.display = false;
- else { cascade = c; show = c; }
- c.display ++= displayFunc;
- cascade = c;
- }
-
- // childremoved write trap
- v.ChildRemoved ++= function(c)
- {
+ if (c != null)
+ {
+ // show c if it is the first card
+ if (v.numchildren > 1) c.display = false;
+ else { cascade = c; show = c; }
+ c.display ++= displayFunc;
+ cascade = c;
+ return;
+ }
+
+ c = thisbox[arguments.index];
// if c is the shown card, attempt to show another
if (show == c)
{
@@ -69,7 +70,7 @@
// clean up traps
c.display --= displayFunc;
- cascade = c;
+ cascade = null;
}
cascade = v;
}
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/lib/widget/tabpane.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/lib/widget/tabpane.t
2007-06-28 21:29:03 UTC (rev 1895)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/lib/widget/tabpane.t
2007-06-28 21:43:30 UTC (rev 1896)
@@ -56,7 +56,7 @@
th_content ++= function(v)
{
/** assign tabs to new cards */
- v.ChildAdded ++= function(c)
+ v.Children ++= function(c)
{
if (th_close) th_close.enabled = (v.numchildren > 1);
@@ -91,17 +91,10 @@
th_head[v.indexof(c)] = c.v_tab;
}
- /** drop tabs of exiting cards tabs */
+ /** drop tabs of exiting cards tabs *
+ FIXME: reinstate
v.ChildRemoved ++= function(c)
{
- /* is this not handled by cardpane?
- // show another card
- if (c == show)
- {
- if (nextcard) nextcard = true;
- else prevcard = true;
- }
- */
// destroy tab if it has not moved
if (c.v_tab.group == tabgroup)
{
@@ -110,7 +103,7 @@
}
// don't allow last tab to be closed
if (th_close) th_close.enabled = (v.numchildren > 1);
- }
+ }*/
/** select tab of shown card */
show ++= function(c)
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/tab.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/tab.t
2007-06-28 21:29:03 UTC (rev 1895)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/tab.t
2007-06-28 21:43:30 UTC (rev 1896)
@@ -5,13 +5,12 @@
<author>Charles Goodwin</author>
</meta:doc>
- <lib:tab redirect="$content" cols="1" padding="4 10">
+ <lib:tab redirect="$content" orient="vertical" padding="4 10">
<ui:box id="gap" vshrink="true" />
<bevel form="tabtop">
- <ui:box id="content" />
- <pad id="focus" padding="4" packed="false" display="false">
- <focusborder />
- </pad>
+ <focusborder id="focus">
+ <ui:box id="content" />
+ </focusborder>
</bevel>
thisbox.th_focus = $focus;
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:29:03 UTC (rev 1895)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/tabpane.t
2007-06-28 21:43:30 UTC (rev 1896)
@@ -7,8 +7,8 @@
<lib:tabpane />
<ui:box redirect="$content" margin="10" padding="10">
- <ui:box id="body" cols="1">
- <ui:box id="wrap" height="27">
+ <ui:box id="body" layout="absolute">
+ <ui:box id="wrap" minheight="27" vshrink="true">
<ui:box id="leftwrap" shrink="true" display="false">
<ui:box width="3" />
<button id="left" fill="#d4d0c8" width="16" height="16">
@@ -16,8 +16,8 @@
</button>
<ui:box width="3" />
</ui:box>
- <ui:box id="headwrap">
- <ui:box align="topleft" id="head" packed="false"
hshrink="true" />
+ <ui:box id="headwrap" layout="absolute">
+ <ui:box align="topleft" id="head" hshrink="true" />
</ui:box>
<ui:box id="rightwrap" shrink="true" display="false">
<ui:box width="3" />
@@ -34,10 +34,10 @@
<ui:box width="3" />
</ui:box>
</ui:box>
- <bevel form="up" thickness="2">
+ <bevel form="up" thickness="2" y="27">
<ui:box id="content" />
</bevel>
- <ui:box id="shadow" align="topleft" height="2" packed="false"
fill="#d4d0c8" />
+ <ui:box id="shadow" align="topleft" fill="#d4d0c8" height="2"
y="27" />
</ui:box>
thisbox.th_close = $close;
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
