diff options
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface.c | 14 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_intern.h | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_layout.c | 2 |
3 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 45a41ed418d..13796fb84a5 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -85,7 +85,7 @@ /* prototypes. */ static void ui_but_to_pixelrect(struct rcti *rect, const struct ARegion *ar, struct uiBlock *block, struct uiBut *but); static void ui_def_but_rna__menu(bContext *UNUSED(C), uiLayout *layout, void *but_p); -static void ui_def_but_rna__popover(bContext *UNUSED(C), uiLayout *layout, void *but_p); +static void ui_def_but_rna__panel_type(bContext *UNUSED(C), uiLayout *layout, void *but_p); /* avoid unneeded calls to ui_but_value_get */ #define UI_BUT_VALUE_UNSET DBL_MAX @@ -1150,7 +1150,9 @@ static bool ui_but_event_property_operator_string( if ((but->type == UI_BTYPE_BUT_MENU) && (but_parent && but_parent->rnaprop) && (RNA_property_type(but_parent->rnaprop) == PROP_ENUM) && - ELEM(but_parent->menu_create_func, ui_def_but_rna__menu, ui_def_but_rna__popover)) + ELEM(but_parent->menu_create_func, + ui_def_but_rna__menu, + ui_def_but_rna__panel_type)) { prop_enum_value = (int)but->hardmin; ptr = &but_parent->rnapoin; @@ -3832,7 +3834,7 @@ static void ui_def_but_rna__menu(bContext *UNUSED(C), uiLayout *layout, void *bu block->flag |= UI_BLOCK_IS_FLIP; } -static void ui_def_but_rna__popover(bContext *C, uiLayout *layout, void *but_p) +static void ui_def_but_rna__panel_type(bContext *C, uiLayout *layout, void *but_p) { uiBut *but = but_p; const char *panel_type = but->func_argN; @@ -3847,18 +3849,18 @@ static void ui_def_but_rna__popover(bContext *C, uiLayout *layout, void *but_p) } } -void ui_but_rna_menu_convert_to_popover(uiBut *but, const char *panel_type) +void ui_but_rna_menu_convert_to_panel_type(uiBut *but, const char *panel_type) { BLI_assert(but->type == UI_BTYPE_MENU); BLI_assert(but->menu_create_func == ui_def_but_rna__menu); BLI_assert((void *)but->poin == but); - but->menu_create_func = ui_def_but_rna__popover; + but->menu_create_func = ui_def_but_rna__panel_type; but->func_argN = BLI_strdup(panel_type); } bool ui_but_menu_draw_as_popover(const uiBut *but) { - return (but->menu_create_func == ui_def_but_rna__popover); + return (but->menu_create_func == ui_def_but_rna__panel_type); } static void ui_but_submenu_enable(uiBlock *block, uiBut *but) diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 930eb72d912..62a828660dd 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -485,7 +485,7 @@ extern uiButExtraIconType ui_but_icon_extra_get(uiBut *but); extern void ui_but_default_set(struct bContext *C, const bool all, const bool use_afterfunc); -extern void ui_but_rna_menu_convert_to_popover(struct uiBut *but, const char *panel_type); +extern void ui_but_rna_menu_convert_to_panel_type(struct uiBut *but, const char *panel_type); extern bool ui_but_menu_draw_as_popover(const uiBut *but); extern void ui_but_update(uiBut *but); diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index fbe8de86b70..7e475a3829b 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -2003,7 +2003,7 @@ void uiItemFullR_with_popover( but = but->next; while (but) { if (but->rnaprop == prop && but->type == UI_BTYPE_MENU) { - ui_but_rna_menu_convert_to_popover(but, panel_type); + ui_but_rna_menu_convert_to_panel_type(but, panel_type); break; } but = but->next; |