diff options
| author | Yevgeny Makarov <jenkm> | 2020-02-03 19:47:04 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-02-03 20:41:49 +0300 |
| commit | 03a29090b57d087b7996dd25e1505537221233f9 (patch) | |
| tree | c85b414774dca963a6256b5460d59e032f705390 /source/blender/editors/interface/interface_icons.c | |
| parent | 5f056fb742fcc79df74d74911369e6b473ec10f0 (diff) | |
UI: invert toolbar icon colors for light toolbar button background
Fixes T64177.
Differential Revision: https://developer.blender.org/D6649
Diffstat (limited to 'source/blender/editors/interface/interface_icons.c')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index 41606fce915..c1018a67fb3 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -119,6 +119,7 @@ typedef struct DrawInfo { } vector; struct { ImBuf *image_cache; + bool inverted; } geom; struct { IconImage *image; @@ -1833,15 +1834,23 @@ static void icon_draw_size(float x, } #endif + /* If the theme is light, we will adjust the icon colors. */ + const bool invert = (rgb_to_grayscale_byte(btheme->tui.wcol_toolbar_item.inner) > 128); + const bool geom_inverted = di->data.geom.inverted; + /* This could re-generate often if rendered at different sizes in the one interface. * TODO(campbell): support caching multiple sizes. */ ImBuf *ibuf = di->data.geom.image_cache; - if ((ibuf == NULL) || (ibuf->x != w) || (ibuf->y != h)) { + if ((ibuf == NULL) || (ibuf->x != w) || (ibuf->y != h) || (invert != geom_inverted)) { if (ibuf) { IMB_freeImBuf(ibuf); } + if (invert != geom_inverted) { + BKE_icon_geom_invert_lightness(icon->obj); + } ibuf = BKE_icon_geom_rasterize(icon->obj, w, h); di->data.geom.image_cache = ibuf; + di->data.geom.inverted = invert; } GPU_blend_set_func_separate( |