Revision: 2398
http://vexi.svn.sourceforge.net/vexi/?rev=2398&view=rev
Author: clrg
Date: 2007-10-01 17:42:32 -0700 (Mon, 01 Oct 2007)
Log Message:
-----------
Tweak toolbar / separator layout
Modified Paths:
--------------
trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/menu.t
trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/submenu.t
trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/toolbar.t
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/win2k/toolbar.t
trunk/widgets/org.vexi.widgets/src/vexi/widget/separator.t
trunk/widgets/org.vexi.widgets/src/vexi/widget/toolbar.t
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/menu.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/menu.t
2007-10-02 00:32:04 UTC (rev 2397)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/menu.t
2007-10-02 00:42:32 UTC (rev 2398)
@@ -20,7 +20,8 @@
thisbox.th_content ++= function(v) {
v.Children ++= function(c) {
// for separators
- c.vshrink = true;
+ if (c.v_is_separator)
+ c.vshrink = true;
// if locked, spoof put from th_list is in action
if (lockChildren) return;
// otherwise redirect child put to th_list
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/submenu.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/submenu.t
2007-10-02 00:32:04 UTC (rev 2397)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/submenu.t
2007-10-02 00:42:32 UTC (rev 2398)
@@ -23,7 +23,8 @@
thisbox.th_content ++= function(v) {
v.Children ++= function(c) {
// for separators
- c.vshrink = true;
+ if (c.v_is_separator)
+ c.vshrink = true;
// if locked, spoof put from th_list is in action
if (lockChildren) return;
// otherwise redirect child put to th_list
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/toolbar.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/toolbar.t
2007-10-02 00:32:04 UTC (rev 2397)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/lib/widget/toolbar.t
2007-10-02 00:42:32 UTC (rev 2398)
@@ -10,20 +10,19 @@
thisbox.group;
thisbox.th_content;
- th_content ++= function(v)
- {
+ th_content ++= function(v) {
cascade = v;
- v.Children ++= function(c)
- {
+ v.Children ++= function(c) {
cascade = c;
if (c == null) {
- th_content[arguments.trapname].group = null;
+ th_content[trapname].group = null;
return;
}
if (group) c.group = group;
else group = c.group;
// for separators
- c.hshrink = "true";
+ if (c.v_is_separator)
+ c.hshrink = "true";
}
}
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/win2k/toolbar.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/win2k/toolbar.t
2007-10-02 00:32:04 UTC (rev 2397)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/win2k/toolbar.t
2007-10-02 00:42:32 UTC (rev 2398)
@@ -7,7 +7,6 @@
<lib:toolbar />
<bevel redirect=":$content" form="thinup" padding="1">
- <ui:box id="content" shrink="true" />
- <ui:box />
+ <ui:box id="content" />
</bevel>
</vexi>
Modified: trunk/widgets/org.vexi.widgets/src/vexi/widget/separator.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/vexi/widget/separator.t 2007-10-02
00:32:04 UTC (rev 2397)
+++ trunk/widgets/org.vexi.widgets/src/vexi/widget/separator.t 2007-10-02
00:42:32 UTC (rev 2398)
@@ -9,7 +9,7 @@
</usage>
</meta:doc>
- <ui:box redirect="null">
+ <ui:box redirect="null" v_is_separator="true">
<lay:margin id="margin">
<separator id="widget" />
</lay:margin>
Modified: trunk/widgets/org.vexi.widgets/src/vexi/widget/toolbar.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/vexi/widget/toolbar.t 2007-10-02
00:32:04 UTC (rev 2397)
+++ trunk/widgets/org.vexi.widgets/src/vexi/widget/toolbar.t 2007-10-02
00:42:32 UTC (rev 2398)
@@ -10,23 +10,19 @@
</meta:doc>
<ui:box redirect=":$content" align="top" vshrink="true">
- <lay:margin id="margin">
- <toolbar id="widget">
- th_content = $content;
- <lay:pad id="pad">
- <ui:box id="content" />
- </lay:pad>
- </toolbar>
- </lay:margin>
+ <toolbar id="widget">
+ th_content = $content;
+ <lay:pad id="pad">
+ <ui:box id="content" />
+ </lay:pad>
+ </toolbar>
// glue code
rdrt..addRedirect(thisbox, $content, "orient", "layout", "font",
"fontsize", "text", "textcolor");
- rdrt..addRedirect(thisbox, $margin, "margin", "marginleft",
"marginright", "margintop", "marginbottom");
rdrt..addRedirect(thisbox, $pad, "padding", "paddingleft",
"paddingright", "paddingtop", "paddingbottom");
rdrt..addRedirect(thisbox, $widget, "enabled", "fill");
- if ($widget.margin) $margin.margin = $widget.margin;
if ($widget.padding) $pad.padding = $widget.padding;
</ui:box>
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: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
