Revision: 2125
http://vexi.svn.sourceforge.net/vexi/?rev=2125&view=rev
Author: clrg
Date: 2007-09-05 13:31:24 -0700 (Wed, 05 Sep 2007)
Log Message:
-----------
Further tab refinement
Modified Paths:
--------------
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/win2k/tab.t
trunk/widgets/org.vexi.widgets/src/vexi/widget/tab.t
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/win2k/tab.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/win2k/tab.t
2007-09-05 20:20:43 UTC (rev 2124)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/win2k/tab.t
2007-09-05 20:31:24 UTC (rev 2125)
@@ -1,48 +1,44 @@
<!-- Copyright 2006 - see COPYING for details [LGPL] -->
<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta"
xmlns="org.vexi.theme.win2k"
- xmlns:lay="vexi.layout" xmlns:lib="org.vexi.lib.widget">
+ xmlns:lay="vexi.layout" xmlns:lib="org.vexi.lib.widget"
xmlns:rdrt="vexi.util.redirect">
<meta:doc>
<author>Charles Goodwin</author>
</meta:doc>
<lib:tab redirect="$content" layout="place">
- <ui:box id="gap" height="2" vshrink="true" />
- <bevel id="bevel" form="tabtop" y="2" shrink="true">
- <lay:pad id="bg" padding="3" fill="#c4c0b8">
+ <bevel id="bg" fill="#c4c0b8" form="tabtop" y="2" shrink="true">
+ <lay:pad padding="3">
<focusborder id="focus">
- <lay:pad id="content" padding="2 6" />
+ <lay:pad padding="2 6">
+ <ui:box id="content" />
+ </lay:pad>
</focusborder>
</lay:pad>
</bevel>
-
- $bevel.height ++= function(v) { height = v - 2; cascade = v; }
- $bevel.width ++= function(v) { width = v; cascade = v; }
-
+
+ thisbox.th_bg = $bg;
+ thisbox.th_content = $content;
thisbox.th_focus = $focus;
- /** show focus border */
- thisbox.focused ++= .focusborder..focusFunc;
+ // assign static traps
+ thisbox.enabled ++= static.enabledFunc;
+ thisbox.selected ++= static.selectedFunc;
+ thisbox.focused ++= .focusborder..focusFunc;
- /** 'raise' when selected */
- thisbox.selected ++= function(v)
- {
- cascade = v;
- $bg.fill = selected ? "#d4d0c8" : "#c4c0b8";
- $bevel.y = selected ? 0 : 2;
- }
+ $bg.height ++= function(v) { height = v - 2; cascade = v; }
+ $bg.width ++= function(v) { width = v; cascade = v; }
- // assign static traps
- thisbox.th_content ++= static.contentFunc;
+ rdrt..addRedirect(thisbox, $content, "orient", "font", "fontsize",
"text", "textcolor");
</lib:tab>
- /** apply traps relating to th_content */
- static.contentFunc = function(v)
+ /** 'raise' when selected */
+ static.selectedFunc = function(v)
{
cascade = v;
- trapee.enabled ++= static.enabledFunc;
- trapee.th_content --= static.contentFunc;
+ trapee.th_bg.fill = trapee.selected ? "#d4d0c8" : "#c4c0b8";
+ trapee.th_bg.y = trapee.selected ? 0 : 2;
}
/** adjust textcolor depending on enabled state */
Modified: trunk/widgets/org.vexi.widgets/src/vexi/widget/tab.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/vexi/widget/tab.t 2007-09-05
20:20:43 UTC (rev 2124)
+++ trunk/widgets/org.vexi.widgets/src/vexi/widget/tab.t 2007-09-05
20:31:24 UTC (rev 2125)
@@ -1,7 +1,6 @@
<!-- Copyright 2006 - see COPYING for details [LGPL] -->
-<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta" xmlns="vexi.theme"
- xmlns:lay="vexi.layout" xmlns:role="org.vexi.lib.role"
xmlns:rdrt="vexi.util.redirect">
+<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta" xmlns="vexi.theme"
xmlns:role="org.vexi.lib.role">
<meta:doc>
<name>Tab</name>
<desc>A tab for use in a tabpane</desc>
@@ -11,21 +10,7 @@
</usage>
</meta:doc>
- <ui:box redirect="$content">
- <tab id="widget">
- th_content = $content;
- <ui:box id="content" />
- </tab>
-
- // glue code
-
- rdrt..addRedirect(thisbox, $content, "orient", "font", "fontsize",
"text", "textcolor");
- rdrt..addRedirect(thisbox, $widget, "enabled", "focusable", "focused",
"fill", "group", "selected", "KeyPressed");
-
- if ($widget.margin) thisbox.margin = $widget.margin;
- if ($widget.padding) $pad.padding = $widget.padding;
-
- </ui:box>
+ <tab />
<role:focusable />
<role:tooltipable />
</vexi>
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
