diff options
author | Julian Eisel <julian@blender.org> | 2020-08-07 15:34:11 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-08-07 16:17:52 +0300 |
commit | 49f088e2d0936ed3b5f08881a14ad83c19951791 (patch) | |
tree | e0d64f096345e3cda1e18a248a09a52869e37407 /source/blender/editors/interface/interface_ops.c | |
parent | 48e089375ebe4aeb30d60e9d8ef6f467280cf07d (diff) |
UI Code Quality: Use derived structs for search buttons and decorators
The current on-size-fits-all `uiBut` creates quite a mess, where it's
hard to reason about which members are free for use, under which
conditions they are used and how.
`uiBut` also has members that aren't used at times, violating the "don't
pay for what you don't use" principle.
To address this, we want to move to typed buttons, where `uiBut` is just
a base struct and each type extends it as needed. That structures data
better and type specific data is only available if it's actually used by
a button type.
Two trade-offs:
* Many casts to the derived type have to be done.
* Sometimes we change the button type after it's created. So I had to
add logic to reallocate the button for use with the new, possibly
derived struct. Ideally that wouldn't be needed, but for now that's
what we have.
Part of T74432.
Differential Revision: https://developer.blender.org/D7610
Reviewed by: Brecht Van Lommel, Campbell Barton
Diffstat (limited to 'source/blender/editors/interface/interface_ops.c')
-rw-r--r-- | source/blender/editors/interface/interface_ops.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index 7ac3c90dcd2..5a49f3e70d0 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -1148,10 +1148,11 @@ static bool jump_to_target_button(bContext *C, bool poll) /* For string properties with prop_search, look up the search collection item. */ if (type == PROP_STRING) { const uiBut *but = UI_context_active_but_get(C); + const uiButSearch *search_but = (but->type == UI_BTYPE_SEARCH_MENU) ? (uiButSearch *)but : + NULL; - if (but->type == UI_BTYPE_SEARCH_MENU && but->search && - but->search->update_fn == ui_rna_collection_search_update_fn) { - uiRNACollectionSearch *coll_search = but->search->arg; + if (search_but && search_but->items_update_fn == ui_rna_collection_search_update_fn) { + uiRNACollectionSearch *coll_search = search_but->arg; char str_buf[MAXBONENAME]; char *str_ptr = RNA_property_string_get_alloc(&ptr, prop, str_buf, sizeof(str_buf), NULL); |