Revision: 4834 http://sourceforge.net/p/vexi/code/4834 Author: clrg Date: 2015-12-04 10:33:41 +0000 (Fri, 04 Dec 2015) Log Message: ----------- Tabs with dark fills have white text / close icon
Modified Paths: -------------- 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/tab.t =================================================================== --- branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/tab.t 2015-11-30 22:58:47 UTC (rev 4833) +++ branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/tab.t 2015-12-04 10:33:41 UTC (rev 4834) @@ -1,6 +1,7 @@ <!-- Copyright (c) - see COPYING for details [LGPL] --> <vexi xmlns:ui="vexi://ui" + xmlns:util="vexi.util" xmlns:lib="org.vexi.lib" xmlns:lay="org.vexi.lib.layout" xmlns="org.vexi.theme.classic"> @@ -16,7 +17,7 @@ <ui:box id="closewrap" shrink="true" display="false"> <lib:role.clickable id="close" cursor="hand" layout="layer" width="16" height="16"> <bevel id="closebg" /> - <ui:box align="center" fill=":.image.close" shrink="true" /> + <ui:box id="closeimg" align="center" fill=":.image.close" shrink="true" /> </lib:role.clickable> </ui:box> </lay:pad> @@ -29,10 +30,15 @@ <ui:box id="overshade" height="1" fill="#80808080" /> </ui:box> + const getReadableColor = util.color..getReadableColor; + $bevel.fill ++= function(v) { var f = v?:.settings..tabfill; cascade = f; $overfill.fill = f; + var tc = getReadableColor(f); + textcolor = tc; + $closeimg.fill = .image["close"+((tc == "white" or tc == "#ffffff")?"_white":"")]; } $bevel.fill = null; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Go from Idea to Many App Stores Faster with Intel(R) XDK Give your users amazing mobile app experiences with Intel(R) XDK. Use one codebase in this all-in-one HTML5 development environment. Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs. http://pubads.g.doubleclick.net/gampad/clk?id=254741911&iu=/4140 _______________________________________________ Vexi-svn mailing list Vexi-svn@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/vexi-svn