From 4935e2449b2c0d52eb27f4889533d72c8e12df94 Mon Sep 17 00:00:00 2001 From: Mike Erwin Date: Wed, 1 Feb 2017 16:44:00 -0500 Subject: [PATCH] BLF can use Theme colors For anything fancier than regular Theme colors (shading, alpha, etc.) do this: unsigned char color[4] UI_GetThemeColor[Fancy]4ubv(... color) BLF_color4ubv(fontid, color) That way the BLF color API stays simple. --- source/blender/blenfont/BLF_api.h | 1 + source/blender/blenfont/intern/blf.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h index afb391e33e6..856234dad48 100644 --- a/source/blender/blenfont/BLF_api.h +++ b/source/blender/blenfont/BLF_api.h @@ -65,6 +65,7 @@ void BLF_position(int fontid, float x, float y, float z); void BLF_size(int fontid, int size, int dpi); /* goal: small but useful color API */ +void BLF_ThemeColor(int fontid, int colorid); void BLF_color4ubv(int fontid, const unsigned char rgba[4]); void BLF_color3ubv(int fontid, const unsigned char rgb[3]); void BLF_color3ubv_alpha(int fontid, const unsigned char rgb[3], unsigned char alpha); diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index 58c6f095ae7..01feb652f31 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -50,9 +50,10 @@ #include "BLI_math.h" #include "BLI_threads.h" -#include "BIF_gl.h" #include "BLF_api.h" +#include "UI_resources.h" + #include "IMB_colormanagement.h" #ifndef BLF_STANDALONE @@ -466,6 +467,15 @@ void BLF_blur(int fontid, int size) } #endif +void BLF_ThemeColor(int fontid, int colorid) +{ + FontBLF *font = blf_get(fontid); + + if (font) { + UI_GetThemeColor4ubv(colorid, font->color); + } +} + void BLF_color4ubv(int fontid, const unsigned char rgba[4]) { FontBLF *font = blf_get(fontid);