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:
-rw-r--r--release/datafiles/userdef/userdef_default_theme.c4
-rw-r--r--source/blender/editors/interface/interface_widgets.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index 6e2678fe9f2..aea7e40573a 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -43,7 +43,7 @@ const bTheme U_theme_default = {
.outline = RGBA(0x191919ff),
.inner = RGBA(0x585858ff),
.inner_sel = RGBA(0x333333ff),
- .item = RGBA(0x191919ff),
+ .item = RGBA(0xffffff8f),
.text = RGBA(0xffffffff),
.text_sel = RGBA(0xffffffff),
.roundness = 0.25f,
@@ -154,7 +154,7 @@ const bTheme U_theme_default = {
},
.wcol_menu_item = {
.inner_sel = RGBA(0x5680c2ff),
- .item = RGBA(0xacacac80),
+ .item = RGBA(0xffffff8f),
.text = RGBA(0xeeeeeeff),
.text_sel = RGBA(0xffffffff),
.shadetop = 38,
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index dbd65ade307..4bf2ac4271b 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1961,9 +1961,12 @@ static void widget_draw_text(uiFontStyle *fstyle, uiWidgetColors *wcol, uiBut *b
/* part text right aligned */
if (drawstr_right) {
+ const char *col = but->block->flag & (UI_BLOCK_LOOP | UI_BLOCK_SHOW_SHORTCUT_ALWAYS) ?
+ wcol->item : wcol->text;
+
fstyle->align = UI_STYLE_TEXT_RIGHT;
rect->xmax -= UI_TEXT_CLIP_MARGIN;
- UI_fontstyle_draw(fstyle, rect, drawstr_right, (unsigned char *)wcol->text);
+ UI_fontstyle_draw(fstyle, rect, drawstr_right, (const uchar *)col);
}
}