diff options
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_intern.h | 10 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_region_popover.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index ec44d97c51b..2b9d684ad96 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -742,7 +742,7 @@ void ui_searchbox_free(struct bContext *C, struct ARegion *region); void ui_but_search_refresh(uiButSearch *but); /* interface_region_menu_popup.c */ -int ui_but_menu_step(uiBut *but, int step); +int ui_but_menu_step(uiBut *but, int direction); bool ui_but_menu_step_poll(const uiBut *but); uiBut *ui_popup_menu_memory_get(struct uiBlock *block); void ui_popup_menu_memory_set(uiBlock *block, struct uiBut *but); @@ -762,14 +762,14 @@ uiPopupBlockHandle *ui_popup_block_create(struct bContext *C, uiPopupBlockHandle *ui_popup_menu_create(struct bContext *C, struct ARegion *butregion, uiBut *but, - uiMenuCreateFunc create_func, + uiMenuCreateFunc menu_func, void *arg); /* interface_region_popover.c */ uiPopupBlockHandle *ui_popover_panel_create(struct bContext *C, struct ARegion *butregion, uiBut *but, - uiMenuCreateFunc create_func, + uiMenuCreateFunc menu_func, void *arg); /* interface_region_menu_pie.c */ @@ -878,7 +878,7 @@ extern uiBut *ui_but_find_select_in_enum(uiBut *but, int direction); bool ui_but_is_editing(const uiBut *but); float ui_block_calc_pie_segment(struct uiBlock *block, const float event_xy[2]); -void ui_but_add_shortcut(uiBut *but, const char *key_str, const bool do_strip); +void ui_but_add_shortcut(uiBut *but, const char *shortcut_str, const bool do_strip); void ui_but_clipboard_free(void); bool ui_but_rna_equals(const uiBut *a, const uiBut *b); bool ui_but_rna_equals_ex(const uiBut *but, @@ -886,7 +886,7 @@ bool ui_but_rna_equals_ex(const uiBut *but, const PropertyRNA *prop, int index); uiBut *ui_but_find_old(uiBlock *block_old, const uiBut *but_new); -uiBut *ui_but_find_new(uiBlock *block_old, const uiBut *but_new); +uiBut *ui_but_find_new(uiBlock *block_new, const uiBut *but_old); #ifdef WITH_INPUT_IME void ui_but_ime_reposition(uiBut *but, int x, int y, bool complete); diff --git a/source/blender/editors/interface/interface_region_popover.c b/source/blender/editors/interface/interface_region_popover.c index 9ef68e9e187..80776c8d26e 100644 --- a/source/blender/editors/interface/interface_region_popover.c +++ b/source/blender/editors/interface/interface_region_popover.c @@ -340,13 +340,13 @@ int UI_popover_panel_invoke(bContext *C, const char *idname, bool keep_open, Rep * \param from_active_button: Use the active button for positioning, * use when the popover is activated from an operator instead of directly from the button. */ -uiPopover *UI_popover_begin(bContext *C, int ui_size_x, bool from_active_button) +uiPopover *UI_popover_begin(bContext *C, int ui_menu_width, bool from_active_button) { uiPopover *pup = MEM_callocN(sizeof(uiPopover), "popover menu"); - if (ui_size_x == 0) { - ui_size_x = U.widget_unit * UI_POPOVER_WIDTH_UNITS; + if (ui_menu_width == 0) { + ui_menu_width = U.widget_unit * UI_POPOVER_WIDTH_UNITS; } - pup->ui_size_x = ui_size_x; + pup->ui_size_x = ui_menu_width; ARegion *butregion = NULL; uiBut *but = NULL; |