Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarley Acheson <harley.acheson@gmail.com>2021-02-08 19:19:23 +0300
committerHarley Acheson <harley.acheson@gmail.com>2021-02-08 19:19:23 +0300
commit694bc4d040a8bf762284598e98bf0575549a3e1c (patch)
tree0e4d95baac18731e0ab5a135acf5eff6f8b53432 /source/blender/editors/interface/interface_widgets.c
parent21a2b975b8192c2714625c8f5e98a08fde796ba7 (diff)
Fix for T84038: Improved Report Warnings
Improved contrast for Status Bar report warning messages. Differential Revision: https://developer.blender.org/D10242 Reviewed by Hans Goudey
Diffstat (limited to 'source/blender/editors/interface/interface_widgets.c')
-rw-r--r--source/blender/editors/interface/interface_widgets.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 8b185f5dc20..5c59d0edeb5 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -2410,7 +2410,9 @@ static void widget_draw_text_icon(const uiFontStyle *fstyle,
rect->xmin += 0.2f * U.widget_unit;
}
- widget_draw_icon(but, icon, alpha, rect, wcol->text);
+ /* By default icon is the color of text, but can optionally override with but->col. */
+ widget_draw_icon(but, icon, alpha, rect, (but->col[3] != 0) ? but->col : wcol->text);
+
if (show_menu_icon) {
BLI_assert(but->block->content_hints & UI_BLOCK_CONTAINS_SUBMENU_BUT);
widget_draw_submenu_tria(but, rect, wcol);