Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPablo Vazquez <venomgfx@gmail.com>2013-02-19 01:19:43 +0400
committerPablo Vazquez <venomgfx@gmail.com>2013-02-19 01:19:43 +0400
commit47c29c1c2ed43f98f64e9e3a5d06e74aec34a072 (patch)
tree2ac6d04e973cb7efe8e217d574f863c374f097e2 /source/blender/editors
parent167dcc88c78b68540ecdd1abc3e26ade73d2d27c (diff)
Themes: disabled items on menus were using a color mix of text and text_selected, this didn't work nice with dark themes and text shadows and overall didn't make much sense.
Now, disabled items use a mix of text and menu item background (inner) color. Same results, but allows dark themes with bright selected text to use shadows. Example case: http://pasteall.org/pic/show.php?id=45697
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/interface/interface_widgets.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 6735c8b173c..68df8e29957 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1804,7 +1804,7 @@ static void widget_state_menu_item(uiWidgetType *wt, int state)
}
/* regular disabled */
else if (state & (UI_BUT_DISABLED | UI_BUT_INACTIVE)) {
- widget_state_blend(wt->wcol.text, wt->wcol.text_sel, 0.5f);
+ widget_state_blend(wt->wcol.text, wt->wcol.inner, 0.5f);
}
/* regular active */
else if (state & UI_ACTIVE) {