From 91c1f9ee770d12694425714a3c5966b9693b2ba5 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 15 Mar 2012 21:11:14 +0000 Subject: Commit patch from Nicholas Bishop with some small modifications to make nicer displaying of brush names. --- source/blender/editors/interface/interface_widgets.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/interface/interface_widgets.c') diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 0e51932df90..72bab289713 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -1367,7 +1367,7 @@ static struct uiWidgetColors wcol_menu_item= { {0, 0, 0, 255}, {0, 0, 0, 0}, {86, 128, 194, 255}, - {255, 255, 255, 255}, + {172, 172, 172, 128}, {255, 255, 255, 255}, {0, 0, 0, 255}, @@ -3297,15 +3297,17 @@ void ui_draw_preview_item(uiFontStyle *fstyle, rcti *rect, const char *name, int bg_rect = trect; bg_rect.xmin = rect->xmin + PREVIEW_PAD; bg_rect.ymin = rect->ymin + PREVIEW_PAD; - bg_rect.xmax += PREVIEW_PAD / 2; + bg_rect.xmax = rect->xmax - PREVIEW_PAD; bg_rect.ymax += PREVIEW_PAD / 2; if(bg_rect.xmax > rect->xmax - PREVIEW_PAD) bg_rect.xmax = rect->xmax - PREVIEW_PAD; UI_GetThemeColor3ubv(TH_BUTBACK, bg_col); - glColor3ubv(bg_col); + glColor4ubv((unsigned char*)wt->wcol.item); + glEnable(GL_BLEND); glRecti(bg_rect.xmin, bg_rect.ymin, bg_rect.xmax, bg_rect.ymax); + glDisable(GL_BLEND); if (state == UI_ACTIVE) glColor3ubv((unsigned char*)wt->wcol.text); -- cgit v1.2.3