[Bf-blender-cvs] [9e71a075473] blender-v3.0-release: UI: Fix UIList item using "regular" widget colors while edited
Pablo Vazquez
noreply at git.blender.org
Thu Nov 4 15:32:10 CET 2021
Commit: 9e71a07547380db131a817f2af9177e95a6c622a
Author: Pablo Vazquez
Date: Thu Nov 4 15:31:48 2021 +0100
Branches: blender-v3.0-release
https://developer.blender.org/rB9e71a07547380db131a817f2af9177e95a6c622a
UI: Fix UIList item using "regular" widget colors while edited
Simply removing the check for `UI_STATE_TEXT_INPUT` makes it inherit
the "List Item" User Interface theme settings. This patch changes the
default theme to match the colors of text input fields.
#### Master
{F11680556, size=full}
#### This patch
{F11680557, size=full}
All the included commmunity themes seem to work well (only Deep Grey might
need more contrast but that's a different patch).
Related reports: T92720
Reviewed By: #user_interface, Severin
Maniphest Tasks: T92720
Differential Revision: https://developer.blender.org/D13073
===================================================================
M release/datafiles/userdef/userdef_default_theme.c
M source/blender/editors/interface/interface_widgets.c
===================================================================
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index f33ecea0eed..fc489abace8 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -187,7 +187,7 @@ const bTheme U_theme_default = {
.outline = RGBA(0x2d2d2dff),
.inner = RGBA(0x2d2d2d00),
.inner_sel = RGBA(0x484a4fff),
- .item = RGBA(0xb3b3b3ff),
+ .item = RGBA(0x4772b3ff),
.text = RGBA(0xccccccff),
.text_sel = RGBA(0xffffffff),
.roundness = 0.2f,
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 3e9042d29a0..4b11ed61657 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -2526,7 +2526,7 @@ static void widget_state(uiWidgetType *wt, int state, int drawflag, eUIEmbossTyp
{
uiWidgetStateColors *wcol_state = wt->wcol_state;
- if ((state & UI_BUT_LIST_ITEM) && !(state & UI_STATE_TEXT_INPUT)) {
+ if (state & UI_BUT_LIST_ITEM) {
/* Override default widget's colors. */
bTheme *btheme = UI_GetTheme();
wt->wcol_theme = &btheme->tui.wcol_list_item;
More information about the Bf-blender-cvs
mailing list