archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

UI: support cycling callback for non RNA menus

Browse Source
This commit is contained in:
Campbell Barton
2015-11-16 06:26:25 +11:00
parent a70357104e
commit 0d267737e2
4 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/interface/interface_regions.c
View File

@@ -111,13 +111,19 @@ bool ui_but_menu_step_poll(const uiBut *but)
BLI_assert(but->type == UI_BTYPE_MENU);
/* currenly only RNA buttons */
return (but->rnaprop && RNA_property_type(but->rnaprop) == PROP_ENUM);
return ((but->menu_step_func != NULL) ||
(but->rnaprop && RNA_property_type(but->rnaprop) == PROP_ENUM));
}
int ui_but_menu_step(uiBut *but, int direction)
{
if (ui_but_menu_step_poll(but)) {
return rna_property_enum_step(but->block->evil_C, &but->rnapoin, but->rnaprop, direction);
if (but->menu_step_func) {
return but->menu_step_func(but->block->evil_C, direction, but->poin);
}
else {
return rna_property_enum_step(but->block->evil_C, &but->rnapoin, but->rnaprop, direction);
}
}
printf("%s: cannot cycle button '%s'\n", __func__, but->str);