Revision: 4729
http://sourceforge.net/p/vexi/code/4729
Author: clrg
Date: 2014-09-10 13:25:29 +0000 (Wed, 10 Sep 2014)
Log Message:
-----------
Smarter tab fill
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
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-09-10 11:56:02 UTC (rev 4728)
+++
branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/bevel.t
2014-09-10 13:25:29 UTC (rev 4729)
@@ -1,4 +1,4 @@
-<!-- Copyright 2013 - see COPYING for details [LGPL] -->
+<!-- Copyright 2014 - see COPYING for details [LGPL] -->
<vexi xmlns:ui="vexi://ui"
xmlns:lay="org.vexi.lib.layout"
@@ -59,6 +59,7 @@
const refill = function(newfillbox) {
// re-fill
+ if (form == "tabtop") trace("refill: "+fillbox.fill);
if (newfillbox != fillbox) {
newfillbox.fill = fillbox.fill;
fillbox.fill = null;
@@ -122,24 +123,24 @@
newfillbox = $inner;
break;
case "tabtop":
- $outer_nn.fill = "#"+shinecolor;//"#c0c0c0";
+ $outer_nn.fill = "#"+shinecolor;
$outer_nw.fill = null;
- $outer_ww.fill = "#"+shinecolor;//"#c0c0c0";
+ $outer_ww.fill = "#"+shinecolor;
$outer_ne.fill = null;
- $outer_sw.fill = null;
- $outer_ee.fill = "#a6"+shadecolor;//"#808080";
+ $outer_sw.fill = "#"+shinecolor;
+ $outer_ee.fill = "#a6"+shadecolor;
$outer_se.fill = null;
$outer_ss.fill = null;
- $inner_nn.fill = "#3f"+shinecolor;//"#c0c0c0";
- $inner_nw.fill = "#3f"+shinecolor;//"#c0c0c0";
- $inner_ww.fill = "#3f"+shinecolor;//"#c0c0c0";
- $inner_ne.fill = "#5a"+shadecolor;//"#808080";
- $inner_sw.fill = "#3f"+shinecolor;//"#c0c0c0";
- $inner_ee.fill = "#5a"+shadecolor;//"#808080";
- $inner_se.fill = "#5a"+shadecolor;//"#808080";
+ $inner_nn.fill = "#3f"+shinecolor;
+ $inner_nw.fill = "#3f"+shinecolor;
+ $inner_ww.fill = "#3f"+shinecolor;
+ $inner_ne.fill = "#5a"+shadecolor;
+ $inner_sw.fill = "#3f"+shinecolor;
+ $inner_ee.fill = "#5a"+shadecolor;
+ $inner_se.fill = "#5a"+shadecolor;
$inner_ss.fill = null;
- newfillbox = $outer;
- refill($outer);
+ newfillbox = $inner;
+ refill($inner);
return;
}
}
Modified:
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/tab.t
2014-09-10 11:56:02 UTC (rev 4728)
+++ branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/tab.t
2014-09-10 13:25:29 UTC (rev 4729)
@@ -9,7 +9,7 @@
<ui:box redirect=":$content" hshrink="true" margin="2 0" padding="2 6">
<ui:box layout="layer" align="bottom">
<bevel id="bevel" form="tabtop">
- <lay:pad id="pad" padding="3" fill=":.settings..tabfill">
+ <lay:pad id="pad" padding="3">
<lib.focusborder id="focus">
<ui:box id="content" minheight="16" />
</lib.focusborder>
@@ -26,18 +26,22 @@
<ui:box id="overfill" height="2" fill=":.settings..tabfill" />
<ui:box width="2" />
</ui:box>
+ <ui:box id="overshade" height="1" fill="#80808080" />
</ui:box>
- $pad.fill ++= function(v) {
+ $bevel.fill ++= function(v) {
var f = v?:.settings..tabfill;
cascade = f;
$overfill.fill = f;
}
+ $bevel.fill = null;
+
thisbox.th_close = $close;
thisbox.th_closewrap = $closewrap;
thisbox.th_focus = $focus;
- thisbox.v_fillbox = $pad;
+ thisbox.v_fillbox = $bevel;
+ thisbox.v_shade = $overshade;
const toBevel = function(v) { $bevel[trapname] = v; }
@@ -73,6 +77,7 @@
trapee.marginbottom = v ? 0 : 2;
trapee.paddingtop = v ? 2 : 2;
trapee.paddingbottom = v ? 6 : 2;
+ trapee.v_shade.display = !v;
}
</vexi>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
