Revision: 4639
http://sourceforge.net/p/vexi/code/4639
Author: clrg
Date: 2014-01-08 19:16:50 + (Wed, 08 Jan 2014)
Log Message:
---
Bevel / tab improvement
- tabtop bevel-based rather than image-based
- shadecolor / shinecolor properties for bevel as white/black don't work on
white/black!
Modified Paths:
--
branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/bevel.t
branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/tab.t
branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/tabpane.t
Removed Paths:
-
branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/image/tabtop/
Modified:
branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/bevel.t
===
---
branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/bevel.t
2014-01-08 03:08:24 UTC (rev 4638)
+++
branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/bevel.t
2014-01-08 19:16:50 UTC (rev 4639)
@@ -50,78 +50,101 @@
thisbox.v_content = $content;
var fillbox = $outer;
-var fillval;
thisbox.fill ++= function() { return fillbox.fill; }
thisbox.fill ++= function(v) { fillbox.fill = v; }
-thisbox.form ++= function(v) {
-if (form == v) return;
-cascade = v;
-
+thisbox.shinecolor = ff;
+thisbox.shadecolor = 00;
+
+const refill = function(newfillbox) {
+// re-fill
+if (newfillbox != fillbox) {
+newfillbox.fill = fillbox.fill;
+fillbox.fill = null;
+fillbox = newfillbox;
+}
+}
+
+const makeBevel = function() {
// bevel colours
var outer1, outer2, outer3, inner1, inner2, inner3;
// might want to adjust fill box
-var nextfillbox = $outer;
+var newfillbox = $outer;
-if (v!=null) {
-switch(v) {
+if (form!=null) {
+switch(form) {
case thinup:
-outer1 = #ff;
-outer2 = #3fff;//#c0c0c0;
-outer3 = #6900;//#7b7d7b;
-nextfillbox = $inner;
+outer1 = #+shinecolor;
+outer2 = #3f+shinecolor;//#c0c0c0;
+outer3 = #69+shadecolor;//#7b7d7b;
+newfillbox = $inner;
break;
case thindown:
-outer1 = #6900;//#7b7d7b;
-outer2 = #3fff;//#c0c0c0;
-outer3 = #ff;
-nextfillbox = $inner;
+outer1 = #69+shadecolor;//#7b7d7b;
+outer2 = #3f+shinecolor;//#c0c0c0;
+outer3 = #+shinecolor;
+newfillbox = $inner;
break;
case up:
-outer1 = #ff;
-outer2 = #a600;//#404040;
-outer3 = #a600;//#404040;
-inner1 = #3fff;//#c0c0c0;
-inner2 = #5a00;//#808080;
-inner3 = #5a00;//#808080;
-nextfillbox = $outer;
+outer1 = #+shinecolor;
+outer2 = #a6+shadecolor;//#404040;
+outer3 = #a6+shadecolor;//#404040;
+inner1 = #3f+shinecolor;//#c0c0c0;
+inner2 = #5a+shadecolor;//#808080;
+inner3 = #5a+shadecolor;//#808080;
+newfillbox = $outer;
break;
case down:
-outer1 = #a600;//#404040;
-outer2 = #ff;
-outer3 = #ff;
-inner1 = #5a00;//#808080;
-inner2 = #3fff;//#c0c0c0;
-inner3 = #3fff;//#c0c0c0;
-nextfillbox = $content;
+outer1 = #a6+shadecolor;//#404040;
+outer2 = #+shinecolor;
+outer3 = #+shinecolor;
+inner1 = #5a+shadecolor;//#808080;
+inner2 = #3f+shinecolor;//#c0c0c0;
+inner3 = #3f+shinecolor;//#c0c0c0;
+newfillbox = $content;
break;
case flat:
-outer1 = #5a00;//#808080;
-outer3 = #ff;
-inner1 = #ff;
-inner2 = #5a00;//#808080;
-inner3 = #5a00;//#808080;
-nextfillbox = $inner;
+outer1 = #5a+shadecolor;//#808080;
+