diff options
| -rw-r--r-- | source/blender/editors/include/UI_interface.h | 3 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface.c | 76 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_intern.h | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 56 |
5 files changed, 81 insertions, 58 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index e8ce5f419bf..c7ed60bcdc0 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -605,6 +605,9 @@ uiBut *uiDefKeyevtButS(uiBlock *block, int retval, const char *str, int x, int y uiBut *uiDefHotKeyevtButS(uiBlock *block, int retval, const char *str, int x, int y, short width, short height, short *keypoin, short *modkeypoin, const char *tip); uiBut *uiDefSearchBut(uiBlock *block, void *arg, int retval, int icon, int maxlen, int x, int y, short width, short height, float a1, float a2, const char *tip); +uiBut *uiDefSearchButO_ptr(uiBlock *block, struct wmOperatorType *ot, IDProperty *properties, + void *arg, int retval, int icon, int maxlen, int x, int y, + short width, short height, float a1, float a2, const char *tip); uiBut *uiDefAutoButR(uiBlock *block, struct PointerRNA *ptr, struct PropertyRNA *prop, int index, const char *name, int icon, int x1, int y1, int x2, int y2); int uiDefAutoButsRNA(uiLayout *layout, struct PointerRNA *ptr, bool (*check_prop)(struct PointerRNA *, struct PropertyRNA *), const char label_align); diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index b5b92976c82..23104eb7027 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -3832,6 +3832,82 @@ void uiButSetSearchFunc(uiBut *but, uiButSearchFunc sfunc, void *arg, uiButHandl } } +/* Callbacks for operator search button. */ +static void operator_enum_search_cb(const struct bContext *C, void *but, const char *str, uiSearchItems *items) +{ + wmOperatorType *ot = ((uiBut *)but)->optype; + PropertyRNA *prop = ot->prop; + + if (prop == NULL) { + printf("%s: %s has no enum property set\n", + __func__, ot->idname); + } + else if (RNA_property_type(prop) != PROP_ENUM) { + printf("%s: %s \"%s\" is not an enum property\n", + __func__, ot->idname, RNA_property_identifier(prop)); + } + else { + PointerRNA *ptr = uiButGetOperatorPtrRNA(but); /* Will create it if needed! */ + EnumPropertyItem *item, *item_array; + int do_free; + + RNA_property_enum_items((bContext *)C, ptr, prop, &item_array, NULL, &do_free); + + for (item = item_array; item->identifier; item++) { + /* note: need to give the index rather than the identifier because the enum can be freed */ + if (BLI_strcasestr(item->name, str)) { + if (false == uiSearchItemAdd(items, item->name, SET_INT_IN_POINTER(item->value), 0)) + break; + } + } + + if (do_free) + MEM_freeN(item_array); + } +} + +static void operator_enum_call_cb(struct bContext *UNUSED(C), void *but, void *arg2) +{ + wmOperatorType *ot = ((uiBut *)but)->optype; + PointerRNA *opptr = uiButGetOperatorPtrRNA(but); /* Will create it if needed! */ + + if (ot) { + if (ot->prop) { + RNA_property_enum_set(opptr, ot->prop, GET_INT_FROM_POINTER(arg2)); + /* We do not call op from here, will be called by button code. + * ui_apply_but_funcs_after() (in interface_handlers.c) called this func before checking operators, + * because one of its parameters is the button itself! + */ + } + else { + printf("%s: op->prop for '%s' is NULL\n", __func__, ot->idname); + } + } +} + +/* Same parameters as for uiDefSearchBut, with an additional operator pointer, from where to get property to search, + * operator type, and operator porperties. */ +uiBut *uiDefSearchButO_ptr(uiBlock *block, wmOperatorType *ot, IDProperty *properties, + void *arg, int retval, int icon, int maxlen, int x, int y, + short width, short height, float a1, float a2, const char *tip) +{ + uiBut *but; + + but = uiDefSearchBut(block, arg, retval, icon, maxlen, x, y, width, height, a1, a2, tip); + uiButSetSearchFunc(but, operator_enum_search_cb, but, operator_enum_call_cb, NULL); + + but->optype = ot; + but->opcontext = WM_OP_EXEC_DEFAULT; + + if (properties) { + PointerRNA *ptr = uiButGetOperatorPtrRNA(but); + /* Copy pointer. */ + RNA_pointer_create(NULL, ot->srna, properties, ptr); + } + + return but; +} + /* push a new event onto event queue to activate the given button * (usually a text-field) upon entering a popup */ diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 1e46b767139..dcad65c3f48 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -199,7 +199,6 @@ typedef struct uiAfterFunc { uiButHandleFunc func; void *func_arg1; void *func_arg2; - void *func_arg3; uiButHandleNFunc funcN; void *func_argN; @@ -386,7 +385,6 @@ static void ui_apply_but_func(bContext *C, uiBut *but) after->func_arg1 = but->func_arg1; after->func_arg2 = but->func_arg2; - after->func_arg3 = but->func_arg3; after->funcN = but->funcN; after->func_argN = MEM_dupallocN(but->func_argN); diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 378ea51f16a..874928ae749 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -201,7 +201,6 @@ struct uiBut { uiButHandleFunc func; void *func_arg1; void *func_arg2; - void *func_arg3; uiButHandleNFunc funcN; void *func_argN; @@ -251,7 +250,6 @@ struct uiBut { /* Operator data */ struct wmOperatorType *optype; - struct IDProperty *opproperties; struct PointerRNA *opptr; short opcontext; unsigned char menu_key; /* 'a'-'z', always lower case */ diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 8b7073c2c65..7cc78cab7f5 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -939,58 +939,6 @@ int WM_menu_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) /* generic enum search invoke popup */ -static void operator_enum_search_cb(const struct bContext *C, void *arg_ot, const char *str, uiSearchItems *items) -{ - wmOperatorType *ot = (wmOperatorType *)arg_ot; - PropertyRNA *prop = ot->prop; - - if (prop == NULL) { - printf("%s: %s has no enum property set\n", - __func__, ot->idname); - } - else if (RNA_property_type(prop) != PROP_ENUM) { - printf("%s: %s \"%s\" is not an enum property\n", - __func__, ot->idname, RNA_property_identifier(prop)); - } - else { - PointerRNA ptr; - - EnumPropertyItem *item, *item_array; - int do_free; - - RNA_pointer_create(NULL, ot->srna, NULL, &ptr); - RNA_property_enum_items((bContext *)C, &ptr, prop, &item_array, NULL, &do_free); - - for (item = item_array; item->identifier; item++) { - /* note: need to give the index rather than the identifier because the enum can be freed */ - if (BLI_strcasestr(item->name, str)) - if (false == uiSearchItemAdd(items, item->name, SET_INT_IN_POINTER(item->value), 0)) - break; - } - - if (do_free) - MEM_freeN(item_array); - } -} - -static void operator_enum_call_cb(struct bContext *C, void *arg1, void *arg2) -{ - wmOperatorType *ot = arg1; - - if (ot) { - if (ot->prop) { - PointerRNA props_ptr; - WM_operator_properties_create_ptr(&props_ptr, ot); - RNA_property_enum_set(&props_ptr, ot->prop, GET_INT_FROM_POINTER(arg2)); - WM_operator_name_call(C, ot->idname, WM_OP_EXEC_DEFAULT, &props_ptr); - WM_operator_properties_free(&props_ptr); - } - else { - printf("%s: op->prop for '%s' is NULL\n", __func__, ot->idname); - } - } -} - static uiBlock *wm_enum_search_menu(bContext *C, ARegion *ar, void *arg_op) { static char search[256] = ""; @@ -1006,8 +954,8 @@ static uiBlock *wm_enum_search_menu(bContext *C, ARegion *ar, void *arg_op) #if 0 /* ok, this isn't so easy... */ uiDefBut(block, LABEL, 0, RNA_struct_ui_name(op->type->srna), 10, 10, 180, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, ""); #endif - but = uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, sizeof(search), 10, 10, 9 * UI_UNIT_X, UI_UNIT_Y, 0, 0, ""); - uiButSetSearchFunc(but, operator_enum_search_cb, op->type, operator_enum_call_cb, NULL); + but = uiDefSearchButO_ptr(block, op->type, op->ptr->data, search, 0, ICON_VIEWZOOM, sizeof(search), + 10, 10, 9 * UI_UNIT_X, UI_UNIT_Y, 0, 0, ""); /* fake button, it holds space for search items */ uiDefBut(block, LABEL, 0, "", 10, 10 - uiSearchBoxHeight(), uiSearchBoxWidth(), uiSearchBoxHeight(), NULL, 0, 0, 0, 0, NULL); |