From 03a29090b57d087b7996dd25e1505537221233f9 Mon Sep 17 00:00:00 2001 From: Yevgeny Makarov Date: Mon, 3 Feb 2020 17:47:04 +0100 Subject: UI: invert toolbar icon colors for light toolbar button background Fixes T64177. Differential Revision: https://developer.blender.org/D6649 --- source/blender/blenkernel/BKE_icons.h | 5 +++-- source/blender/blenkernel/intern/icons.c | 4 ++-- source/blender/blenkernel/intern/icons_rasterize.c | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_icons.h b/source/blender/blenkernel/BKE_icons.h index 417591e03c5..27d7f45e480 100644 --- a/source/blender/blenkernel/BKE_icons.h +++ b/source/blender/blenkernel/BKE_icons.h @@ -62,8 +62,8 @@ struct Icon_Geom { int icon_id; int coords_len; int coords_range[2]; - const unsigned char (*coords)[2]; - const unsigned char (*colors)[4]; + unsigned char (*coords)[2]; + unsigned char (*colors)[4]; /* when not NULL, the memory of coords and colors is a sub-region of this pointer. */ const void *mem; }; @@ -160,6 +160,7 @@ struct Icon_Geom *BKE_icon_geom_from_file(const char *filename); struct ImBuf *BKE_icon_geom_rasterize(const struct Icon_Geom *geom, const unsigned int size_x, const unsigned int size_y); +void BKE_icon_geom_invert_lightness(struct Icon_Geom *geom); int BKE_icon_ensure_studio_light(struct StudioLight *sl, int id_type); diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c index 7b8a0a8894f..6363a23de6c 100644 --- a/source/blender/blenkernel/intern/icons.c +++ b/source/blender/blenkernel/intern/icons.c @@ -842,8 +842,8 @@ struct Icon_Geom *BKE_icon_geom_from_memory(const uchar *data, size_t data_len) p += 2; geom->coords_len = coords_len; - geom->coords = (const void *)p; - geom->colors = (const void *)(p + (data_len / 3)); + geom->coords = (void *)p; + geom->colors = (void *)(p + (data_len / 3)); geom->icon_id = 0; geom->mem = data; return geom; diff --git a/source/blender/blenkernel/intern/icons_rasterize.c b/source/blender/blenkernel/intern/icons_rasterize.c index e87180ce732..f731285e029 100644 --- a/source/blender/blenkernel/intern/icons_rasterize.c +++ b/source/blender/blenkernel/intern/icons_rasterize.c @@ -139,3 +139,17 @@ ImBuf *BKE_icon_geom_rasterize(const struct Icon_Geom *geom, IMB_scaleImBuf(ibuf, size_x, size_y); return ibuf; } + +void BKE_icon_geom_invert_lightness(struct Icon_Geom *geom) +{ + const int length = 3 * geom->coords_len; + + for (int i = 0; i < length; i++) { + float rgb[3], hsl[3]; + + rgb_uchar_to_float(rgb, geom->colors[i]); + rgb_to_hsl_v(rgb, hsl); + hsl_to_rgb(hsl[0], hsl[1], 1.0f - hsl[2], &rgb[0], &rgb[1], &rgb[2]); + rgb_float_to_uchar(geom->colors[i], rgb); + } +} -- cgit v1.2.3