[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19236] branches/blender2.5/blender/source /blender/editors/interface/interface_draw.c: * fixed the pulldown text embossing, looked awful on dark themes

Matt Ebb matt at mke3.net
Mon Mar 9 09:56:40 CET 2009


Revision: 19236
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19236
Author:   broken
Date:     2009-03-09 09:56:36 +0100 (Mon, 09 Mar 2009)

Log Message:
-----------
* fixed the pulldown text embossing, looked awful on dark themes

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/interface_draw.c

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_draw.c	2009-03-09 08:31:45 UTC (rev 19235)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_draw.c	2009-03-09 08:56:36 UTC (rev 19236)
@@ -2221,10 +2221,15 @@
 	
 	/* text color, with pulldown item exception */
 	if(but->dt==UI_EMBOSSP) {
-		if((but->flag & UI_ACTIVE) && but->type!=LABEL) {	// LABEL = title in pulldowns
-			UI_ThemeColorShadeAlpha(TH_MENU_TEXT_HI, col_offs, alpha_offs);
+		if (sunken) {
+			float col[4];
+			UI_GetThemeColor4ubv(TH_MENU_TEXT, col);
+			if ((col[0] + col[1] + col[2]) / 3.f < 0.5f)
+				UI_ThemeColorShadeAlpha(TH_HEADER, 40, alpha_offs);
+		} else if((but->flag & UI_ACTIVE) && but->type!=LABEL) {	// LABEL = title in pulldowns
+			UI_ThemeColorShadeAlpha(TH_MENU_TEXT_HI, 0, alpha_offs);
 		} else {
-			UI_ThemeColorShadeAlpha(TH_MENU_TEXT, col_offs, alpha_offs);
+			UI_ThemeColorShadeAlpha(TH_MENU_TEXT, 0, alpha_offs);
 		}
 	}
 	else {





More information about the Bf-blender-cvs mailing list