diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-05-19 11:22:44 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-19 11:25:52 +0300 |
commit | d3c89f50a0167cb978daf3eda064bc7f36167de8 (patch) | |
tree | ac7931356704dc3cf3577011e30ab048deb0840a /source | |
parent | 671797e22e1a5d2cb9f7df9d30012d8a38962ad2 (diff) |
UI: Use popover for toolbar popup operator
- Currently the popup closes immediately, could be made configurable.
- Support exiting popups when their submenu's are accessed.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/interface/interface_region_popover.c | 5 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_region_popup.c | 15 |
2 files changed, 20 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface_region_popover.c b/source/blender/editors/interface/interface_region_popover.c index 219a4fc8ed5..fcfbc3027d0 100644 --- a/source/blender/editors/interface/interface_region_popover.c +++ b/source/blender/editors/interface/interface_region_popover.c @@ -250,6 +250,11 @@ void UI_popover_end(bContext *C, uiPopover *pup) UI_popup_handlers_add(C, &window->modalhandlers, handle, 0); WM_event_add_mousemove(C); handle->popup = true; + + /* TODO(campbell): we may want to make this configurable. + * The begin/end stype of calling popups doesn't allow to 'can_refresh' to be set. + * For now close this style of popvers when accessed. */ + UI_block_flag_disable(pup->block, UI_BLOCK_KEEP_OPEN); } uiLayout *UI_popover_layout(uiPopover *pup) diff --git a/source/blender/editors/interface/interface_region_popup.c b/source/blender/editors/interface/interface_region_popup.c index db3c8742e09..654dc5e4d30 100644 --- a/source/blender/editors/interface/interface_region_popup.c +++ b/source/blender/editors/interface/interface_region_popup.c @@ -704,6 +704,21 @@ uiPopupBlockHandle *ui_popup_block_create( void ui_popup_block_free(bContext *C, uiPopupBlockHandle *handle) { + /* If this popup is created from a popover which does NOT have keep-open flag set, + * then close the popover too. We could extend this to other popup types too. */ + ARegion *ar = handle->popup_create_vars.butregion; + if (ar != NULL) { + for (uiBlock *block = ar->uiblocks.first; block; block = block->next) { + if (block->handle && + (block->flag & UI_BLOCK_POPOVER) && + (block->flag & UI_BLOCK_KEEP_OPEN) == 0) + { + uiPopupBlockHandle *menu = block->handle; + menu->menuretval = UI_RETURN_OK; + } + } + } + if (handle->popup_create_vars.free_func) { handle->popup_create_vars.free_func(handle, handle->popup_create_vars.arg); } |