diff options
Diffstat (limited to 'source/blender/editors/interface/interface_templates.c')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 98d5bae0ff1..f730e4c0e52 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -287,8 +287,14 @@ static uiBlock *template_common_search_menu(const bContext *C, 0, ""); } - UI_but_func_search_set( - but, ui_searchbox_create_generic, search_func, search_arg, NULL, handle_func, active_item); + UI_but_func_search_set(but, + ui_searchbox_create_generic, + search_func, + search_arg, + NULL, + handle_func, + NULL, + active_item); UI_block_bounds_set_normal(block, 0.3f * U.widget_unit); UI_block_direction_set(block, UI_DIR_DOWN); @@ -6660,8 +6666,14 @@ static void operator_search_cb(const bContext *C, void UI_but_func_operator_search(uiBut *but) { - UI_but_func_search_set( - but, ui_searchbox_create_operator, operator_search_cb, NULL, false, operator_call_cb, NULL); + UI_but_func_search_set(but, + ui_searchbox_create_operator, + operator_search_cb, + NULL, + false, + operator_call_cb, + NULL, + NULL); } void uiTemplateOperatorSearch(uiLayout *layout) @@ -6684,6 +6696,9 @@ void uiTemplateOperatorSearch(uiLayout *layout) /** \name Menu Search Template * \{ */ +/* Unicode arrow. */ +#define MENU_SEP "\xe2\x96\xb6" + struct MenuSearch_Parent { struct MenuSearch_Parent *parent; MenuType *parent_mt; @@ -6952,7 +6967,7 @@ static struct MenuSearch_Data *menu_items_from_ui_create(bContext *C, SPACE_MENU_MAP(SPACE_INFO, "INFO_MT_editor_menus"); SPACE_MENU_MAP(SPACE_SEQ, "SEQUENCER_MT_editor_menus"); SPACE_MENU_MAP(SPACE_TEXT, "TEXT_MT_editor_menus"); - SPACE_MENU_MAP(SPACE_ACTION, "ACTION_MT_editor_menus"); + SPACE_MENU_MAP(SPACE_ACTION, "DOPESHEET_MT_editor_menus"); SPACE_MENU_MAP(SPACE_NLA, "NLA_MT_editor_menus"); SPACE_MENU_MAP(SPACE_NODE, "NODE_MT_editor_menus"); SPACE_MENU_MAP(SPACE_CONSOLE, "CONSOLE_MT_editor_menus"); @@ -7127,9 +7142,6 @@ static struct MenuSearch_Data *menu_items_from_ui_create(bContext *C, /* NOTE: currently this builds the full path for each menu item, * that could be moved into the parent menu. */ - /* Unicode arrow. */ -#define MENU_SEP "\xe2\x86\x92" - /* Set names as full paths. */ LISTBASE_FOREACH (struct MenuSearch_Item *, item, &data->items) { if (item->menu_parent != NULL) { @@ -7176,7 +7188,6 @@ static struct MenuSearch_Data *menu_items_from_ui_create(bContext *C, BLI_dynstr_clear(dyn_str); } BLI_dynstr_free(dyn_str); -#undef MENU_SEP /* Finally sort menu items. * @@ -7309,6 +7320,7 @@ void UI_but_func_menu_search(uiBut *but) data, menu_items_from_ui_destroy, menu_call_fn, + MENU_SEP, NULL); } @@ -7326,6 +7338,8 @@ void uiTemplateMenuSearch(uiLayout *layout) UI_but_func_menu_search(but); } +#undef MENU_SEP + /** \} */ /* -------------------------------------------------------------------- */ |