blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Theming: Use list-item colors for all un-embossed buttons in list-items 

E.g. number buttons in the shape key list would use theme colors of text
widgets.

Addresses T50862.
This commit is contained in:
Julian Eisel 2018-03-23 20:32:58 +01:00
parent a7e4268bee
commit 357b72e0a7
Notes: blender-bot 2023-02-14 09:43:37 +01:00 
Referenced by commit 728e92422e, Fix T54524: keyframe and driver colors not showing in shape key list.
Referenced by issue #54524, Drivers color not showing up in shapekeys values anymore
Referenced by issue #50862, Color of List Item's values
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/interface/interface_handlers.c
View File

@ -7713,7 +7713,10 @@ static void button_activate_state(bContext *C, uiBut *but, uiHandleButtonState s
/* highlight has timers for tooltips and auto open */
if (state == BUTTON_STATE_HIGHLIGHT) {
but->flag &= ~UI_SELECT;
/* for list-items (that are not drawn with regular emboss), don't change selection based on hovering */
if (((but->flag & UI_BUT_LIST_ITEM) == 0) && (but->dragflag & UI_EMBOSS_NONE)) {
but->flag &= ~UI_SELECT;
}
button_tooltip_timer_reset(C, but);

2
source/blender/editors/interface/interface_layout.c
View File

@ -1486,7 +1486,7 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
}
/* Mark non-embossed textfields inside a listbox. */
if (but && (block->flag & UI_BLOCK_LIST_ITEM) && (but->type == UI_BTYPE_TEXT) && (but->dt & UI_EMBOSS_NONE)) {
if (but && (block->flag & UI_BLOCK_LIST_ITEM) && (but->dt & UI_EMBOSS_NONE)) {
UI_but_flag_enable(but, UI_BUT_LIST_ITEM);
}