From 6c97c7f767c9127469e39222b19f45eba15b41e0 Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Mon, 28 Jun 2021 10:00:15 -0500 Subject: Fix T89350: Emboss color missing from icon buttons without emboss Passing `emboss=False`set `UI_EMBOSS_NONE` in the layout, which completely disables button background colors for things like animation state. This commit changes that to `UI_EMBOSS_NONE_OR_STATUS`, which effectively restores the behavior to what it was prior to the addition of that flag, with the added option to completely disable the status emboss with `UI_EMBOSS_NONE`. --- source/blender/editors/interface/interface_layout.c | 4 ++-- source/blender/makesrna/intern/rna_ui_api.c | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'source') diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 1ab6d050b4d..a00a7e19b01 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -1191,7 +1191,7 @@ static uiBut *uiItemFullO_ptr_ex(uiLayout *layout, const eUIEmbossType prev_emboss = layout->emboss; if (flag & UI_ITEM_R_NO_BG) { - layout->emboss = UI_EMBOSS_NONE; + layout->emboss = UI_EMBOSS_NONE_OR_STATUS; } /* create the button */ @@ -2122,7 +2122,7 @@ void uiItemFullR(uiLayout *layout, const eUIEmbossType prev_emboss = layout->emboss; if (no_bg) { - layout->emboss = UI_EMBOSS_NONE; + layout->emboss = UI_EMBOSS_NONE_OR_STATUS; } uiBut *but = NULL; diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index dc973a9c75c..41d32bb0c92 100644 --- a/source/blender/makesrna/intern/rna_ui_api.c +++ b/source/blender/makesrna/intern/rna_ui_api.c @@ -912,7 +912,12 @@ void RNA_api_ui_layout(StructRNA *srna) RNA_def_boolean(func, "event", false, "", "Use button to input key events"); RNA_def_boolean( func, "full_event", false, "", "Use button to input full events including modifiers"); - RNA_def_boolean(func, "emboss", true, "", "Draw the button itself, not just the icon/text"); + RNA_def_boolean(func, + "emboss", + true, + "", + "Draw the button itself, not just the icon/text. When false, corresponds to the " + "'NONE_OR_STATUS' layout emboss type"); RNA_def_int(func, "index", /* RNA_NO_INDEX == -1 */ -- cgit v1.2.3