blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

UI: Fixes for the highlighting of Selected Enums #111938

Merged
Harley Acheson merged 2 commits from Harley/blender:SelectedEnumFixes into main 2023-09-06 17:56:05 +02:00
Conversation 0 Commits 2 Files Changed 2 +3 -6
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/interface/interface.cc
View File

@ -4470,9 +4470,8 @@ static void ui_def_but_rna__menu(bContext * /*C*/, uiLayout *layout, void *but_p
-1,
item->description);
}
item_but->flag |= UI_BUT_LIST_ITEM;
if (item->value == current_value) {
item_but->flag |= UI_BUT_ACTIVE_DEFAULT;
item_but->flag |= UI_SELECT_DRAW;
}
}
}

6
source/blender/editors/interface/interface_widgets.cc
View File

@ -2737,10 +2737,8 @@ static void widget_state_menu_item(uiWidgetType *wt,
/* Regular disabled. */
color_blend_v3_v3(wt->wcol.text, wt->wcol.inner, 0.5f);
}
else if ((state->but_flag & UI_BUT_LIST_ITEM) &&
state->but_flag & (UI_BUT_ACTIVE_DEFAULT | UI_SELECT))
{
/* Currently-selected list item. */
else if (state->but_flag & (UI_BUT_ACTIVE_DEFAULT | UI_SELECT_DRAW)) {
/* Currently-selected item. */
copy_v4_v4_uchar(wt->wcol.inner, wt->wcol.inner_sel);
copy_v4_v4_uchar(wt->wcol.text, wt->wcol.text_sel);
}