archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix most UI text color

Browse Source 
There are still many places to fix. I'll miss the bright yellow!

This commit also uses the new BLF_default function where possible.

Part of T49043 since we call glColor less often.
This commit is contained in:
Mike Erwin
2017-02-05 00:54:21 -05:00
parent 5908382011
commit 5ad5bb235b
9 changed files with 47 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/interface/interface_widgets.c
View File

@@ -1457,7 +1457,7 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
}
#endif
glColor4ubv((unsigned char *)wcol->text);
BLF_color4ubv(fstyle->uifont_id, (unsigned char *)wcol->text);
if (!use_right_only) {
/* for underline drawing */
@@ -4125,7 +4125,7 @@ void ui_draw_menu_item(uiFontStyle *fstyle, rcti *rect, const char *name, int ic
UI_text_clip_middle_ex(fstyle, drawstr, okwidth, minwidth, max_len, '\0');
}
glColor4ubv((unsigned char *)wt->wcol.text);
BLF_color4ubv(fstyle->uifont_id, (unsigned char *)wt->wcol.text);
UI_fontstyle_draw(fstyle, rect, drawstr);
}
@@ -4192,7 +4192,7 @@ void ui_draw_preview_item(uiFontStyle *fstyle, rcti *rect, const char *name, int
BLI_strncpy(drawstr, name, sizeof(drawstr));
UI_text_clip_middle_ex(fstyle, drawstr, okwidth, minwidth, max_len, '\0');
glColor4ubv((unsigned char *)wt->wcol.text);
BLF_color4ubv(fstyle->uifont_id, (unsigned char *)wt->wcol.text);
UI_fontstyle_draw(fstyle, &trect, drawstr);
}
}