Revision: 3338
http://vexi.svn.sourceforge.net/vexi/?rev=3338&view=rev
Author: clrg
Date: 2009-01-05 03:39:14 +0000 (Mon, 05 Jan 2009)
Log Message:
-----------
- Replace image bevels with fill bevels
- Simplify separator (not a container)
- Remove repeat margin/padding put in container
Modified Paths:
--------------
trunk/widgets/org.vexi.widgets/src/org/vexi/lib/layout/container.t
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/bevel.t
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/separator.t
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/tab.t
trunk/widgets/org.vexi.widgets/src/vexi/widget/separator.t
Added Paths:
-----------
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/image/tabtop/
Removed Paths:
-------------
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/image/bevel1flat/
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/image/bevelabove/
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/image/beveldown/
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/image/bevelflat/
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/image/beveltabtop/
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/image/bevelthindown/
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/image/bevelthinup/
trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/image/bevelup/
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/lib/layout/container.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/layout/container.t
2009-01-04 05:24:45 UTC (rev 3337)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/lib/layout/container.t
2009-01-05 03:39:14 UTC (rev 3338)
@@ -51,10 +51,6 @@
thisbox.textalign ++= static.textalignWrite;
}
}
-
- // common settings
- if (thisbox.margin) margin = margin;
- if (thisbox.padding) padding = padding;
}; // end
</ui:box>
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/bevel.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/bevel.t
2009-01-04 05:24:45 UTC (rev 3337)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/bevel.t
2009-01-05 03:39:14 UTC (rev 3338)
@@ -6,14 +6,106 @@
<author>Charles Goodwin</author>
</meta:doc>
- <lay:border>
- thisbox.form ++= static.formFunc;
- </lay:border>
-
- static.formFunc = function(v) {
- if (v != trapee.form)
- trapee.border = v == null ? null : .image["bevel"+v];
- cascade = v;
- }
-
+ <ui:box redirect=":$content">
+ <ui:box orient="vertical" hshrink="true">
+ <ui:box id="outer_nw" height="1" />
+ <ui:box id="outer_ww" width="1" />
+ <ui:box id="outer_sw" height="1" />
+ </ui:box>
+ <ui:box orient="vertical">
+ <ui:box id="outer_nn" height="1" vshrink="true" />
+ <ui:box>
+ <ui:box orient="vertical" hshrink="true">
+ <ui:box id="inner_nw" height="1" />
+ <ui:box id="inner_ww" width="1" />
+ <ui:box id="inner_sw" height="1" />
+ </ui:box>
+ <ui:box orient="vertical">
+ <ui:box id="inner_nn" height="1" vshrink="true" />
+ <ui:box id="content" />
+ <ui:box id="inner_ss" height="1" vshrink="true" />
+ </ui:box>
+ <ui:box orient="vertical" hshrink="true">
+ <ui:box id="inner_ne" height="1" />
+ <ui:box id="inner_ee" width="1" />
+ <ui:box id="inner_se" height="1" />
+ </ui:box>
+ </ui:box>
+ <ui:box id="outer_ss" height="1" vshrink="true" />
+ </ui:box>
+ <ui:box orient="vertical" hshrink="true">
+ <ui:box id="outer_ne" height="1" />
+ <ui:box id="outer_ee" width="1" />
+ <ui:box id="outer_se" height="1" />
+ </ui:box>
+
+ thisbox.v_content = $content;
+
+ thisbox.form ++= function(v) {
+ cascade = v;
+ var outer1, outer2, outer3, inner1, inner2, inner3;
+ if (v!=null) {
+ switch(v) {
+ case "thinup":
+ outer1 = "#ffffff";
+ outer2 = "#c0c0c0";
+ outer3 = "#7b7d7b";
+ break;
+ case "thindown":
+ outer1 = "#7b7d7b";
+ outer2 = "#c0c0c0";
+ outer3 = "#ffffff";
+ break;
+ case "up":
+ outer1 = "#ffffff";
+ outer2 = "#404040";
+ outer3 = "#404040";
+ inner1 = "#c0c0c0";
+ inner2 = "#808080";
+ inner3 = "#808080";
+ break;
+ case "down":
+ outer1 = "#404040";
+ outer2 = "#ffffff";
+ outer3 = "#ffffff";
+ inner1 = "#808080";
+ inner2 = "#c0c0c0";
+ inner3 = "#c0c0c0";
+ break;
+ case "flat":
+ outer1 = "#808080";
+ outer3 = "#ffffff";
+ inner1 = "#ffffff";
+ inner2 = "#808080";
+ inner3 = "#808080";
+ break;
+ case "above":
+ outer1 = "#c0c0c0";
+ outer2 = "#404040";
+ outer3 = "#404040";
+ inner1 = "#ffffff";
+ inner2 = "#808080";
+ inner3 = "#808080";
+ break;
+ }
+ }
+ $outer_nn.fill = outer1;
+ $outer_nw.fill = outer1;
+ $outer_ww.fill = outer1;
+ $outer_ne.fill = outer2;
+ $outer_sw.fill = outer2;
+ $outer_ee.fill = outer3;
+ $outer_se.fill = outer3;
+ $outer_ss.fill = outer3;
+ $inner_nn.fill = inner1;
+ $inner_nw.fill = inner1;
+ $inner_ww.fill = inner1;
+ $inner_ne.fill = inner2;
+ $inner_sw.fill = inner2;
+ $inner_ee.fill = inner3;
+ $inner_se.fill = inner3;
+ $inner_ss.fill = inner3;
+ }
+
+ </ui:box>
</vexi>
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/separator.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/separator.t
2009-01-04 05:24:45 UTC (rev 3337)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/separator.t
2009-01-05 03:39:14 UTC (rev 3338)
@@ -1,30 +1,29 @@
<!-- Copyright 2008 - see COPYING for details [LGPL] -->
-<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta" xmlns="org.vexi.lib.widget"
- xmlns:image="org.vexi.theme.classic.image.bevelthindown">
+<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta"
xmlns="org.vexi.lib.widget">
<meta:doc>
<author>Charles Goodwin</author>
</meta:doc>
- <separator redirect=":$content" margin="3">
- <ui:box orient="vertical" hshrink="true">
- <ui:box id="nw" fill=":image.nw" shrink="true" />
- <ui:box id="ww" layout="place" hshrink="true" width="1"><ui:box
fill=":image.ww" /></ui:box>
- <ui:box id="sw" fill=":image.sw" shrink="true" />
+ <separator redirect="null" margin="3">
+ <ui:box orient="vertical" hshrink="true" minwidth="1">
+ <ui:box fill="#7b7d7b" vshrink="true" minheight="1" />
+ <ui:box fill="#7b7d7b" />
+ <ui:box fill="#c0c0c0" vshrink="true" minheight="1" />
</ui:box>
// central column
<ui:box orient="vertical">
- <ui:box id="nn" layout="place" vshrink="true" height="1"><ui:box
fill=":image.nn" /></ui:box>
- <ui:box><ui:box id="content" display="false" /></ui:box>
- <ui:box id="ss" layout="place" vshrink="true" height="1"><ui:box
fill=":image.ss" /></ui:box>
+ <ui:box fill="#7b7d7b" vshrink="true" minheight="1" />
+ <ui:box />
+ <ui:box fill="#ffffff" vshrink="true" minheight="1" />
</ui:box>
// right column
- <ui:box orient="vertical" hshrink="true">
- <ui:box id="ne" fill=":image.ne" shrink="true" />
- <ui:box id="ee" layout="place" hshrink="true" width="1"><ui:box
fill=":image.ee" /></ui:box>
- <ui:box id="se" fill=":image.se" shrink="true" />
+ <ui:box orient="vertical" hshrink="true" minwidth="1">
+ <ui:box fill="#c0c0c0" vshrink="true" minheight="1" />
+ <ui:box fill="#ffffff" />
+ <ui:box fill="#ffffff" vshrink="true" minheight="1" />
</ui:box>
</separator>
</vexi>
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/tab.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/tab.t
2009-01-04 05:24:45 UTC (rev 3337)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/tab.t
2009-01-05 03:39:14 UTC (rev 3338)
@@ -1,16 +1,15 @@
<!-- Copyright 2008 - see COPYING for details [LGPL] -->
<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta" xmlns="vexi.theme"
- xmlns:lib="org.vexi.lib"
- xmlns:rdrt="vexi.util.redirect">
+ xmlns:lib="org.vexi.lib" xmlns:lay="org.vexi.lib.layout">
<meta:doc>
<author>Charles Goodwin</author>
</meta:doc>
<lib:widget.tab />
<ui:box redirect=":$content" align="topleft" hshrink="true" margin="2 0"
padding="2 6">
- <bevel form="tabtop">
- <lib:layout.pad id="pad" padding="3" fill="#d4d0c8">
+ <lay:border border=":.image.tabtop">
+ <lay:pad id="pad" padding="3" fill="#d4d0c8">
<focusborder id="focus">
<ui:box id="content" minheight="16" />
</focusborder>
@@ -20,8 +19,8 @@
<ui:box align="center" fill=":.image.close"
shrink="true" />
</lib:role.clickable>
</ui:box>
- </lib:layout.pad>
- </bevel>
+ </lay:pad>
+ </lay:border>
thisbox.th_close = $close;
thisbox.th_closewrap = $closewrap;
Modified: trunk/widgets/org.vexi.widgets/src/vexi/widget/separator.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/vexi/widget/separator.t 2009-01-04
05:24:45 UTC (rev 3337)
+++ trunk/widgets/org.vexi.widgets/src/vexi/widget/separator.t 2009-01-05
03:39:14 UTC (rev 3338)
@@ -11,6 +11,4 @@
<margin />
<theme:separator />
- <pad />
- <container />
</vexi>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
