griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix UI views not refreshing properly in popovers

Browse Source 
No UI views are used inside popups in the main branch yet, #104831 does
this so this issue became apparent. For example tree-view items would
not change their collapsed state.

UI views require the block to be attached to a region when drawing, so
that the matching to previous versions of the tree works. Before this
commit the block was attached just after.

The `BLI_findindex()` check before attaching the block was already done
for other kinds of popups, so this is more in sync now.
This commit is contained in:
Julian Eisel
2023-06-20 17:16:18 +02:00
parent a6d2bb92ed
commit 167c5c6b53
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/blender/editors/interface/interface_region_popover.cc
View File

@@ -75,13 +75,21 @@ struct uiPopover {
#endif #endif
}; };
static void ui_popover_create_block(bContext *C, uiPopover *pup, wmOperatorCallContext opcontext) /**
* \param region: Optional, the region the block will be placed in. Must be set if the popover is
* supposed to support refreshing.
*/
static void ui_popover_create_block(bContext *C,
ARegion *region,
uiPopover *pup,
wmOperatorCallContext opcontext)
{ {
BLI_assert(pup->ui_size_x != 0); BLI_assert(pup->ui_size_x != 0);
const uiStyle *style = UI_style_get_dpi(); const uiStyle *style = UI_style_get_dpi();
pup->block = UI_block_begin(C, nullptr, __func__, UI_EMBOSS); pup->block = UI_block_begin(C, region, __func__, UI_EMBOSS);
UI_block_flag_enable(pup->block, UI_BLOCK_KEEP_OPEN | UI_BLOCK_POPOVER); UI_block_flag_enable(pup->block, UI_BLOCK_KEEP_OPEN | UI_BLOCK_POPOVER);
#ifdef USE_UI_POPOVER_ONCE #ifdef USE_UI_POPOVER_ONCE
if (pup->is_once) { if (pup->is_once) {
@@ -109,7 +117,7 @@ static uiBlock *ui_block_func_POPOVER(bContext *C, uiPopupBlockHandle *handle, v
/* Create UI block and layout now if it wasn't done between begin/end. */ /* Create UI block and layout now if it wasn't done between begin/end. */
if (!pup->layout) { if (!pup->layout) {
ui_popover_create_block(C, pup, WM_OP_INVOKE_REGION_WIN); ui_popover_create_block(C, nullptr, pup, WM_OP_INVOKE_REGION_WIN);
if (pup->menu_func) { if (pup->menu_func) {
pup->block->handle = handle; pup->block->handle = handle;
@@ -124,7 +132,12 @@ static uiBlock *ui_block_func_POPOVER(bContext *C, uiPopupBlockHandle *handle, v
uiBlock *block = pup->block; uiBlock *block = pup->block;
int width, height; int width, height;
UI_block_region_set(block, handle->region); /* in some cases we create the block before the region,
* so we set it delayed here if necessary */
if (BLI_findindex(&handle->region->uiblocks, block) == -1) {
UI_block_region_set(block, handle->region);
}
UI_block_layout_resolve(block, &width, &height); UI_block_layout_resolve(block, &width, &height);
UI_block_direction_set(block, UI_DIR_DOWN | UI_DIR_CENTER_X); UI_block_direction_set(block, UI_DIR_DOWN | UI_DIR_CENTER_X);
@@ -348,7 +361,7 @@ uiPopover *UI_popover_begin(bContext *C, int ui_menu_width, bool from_active_but
pup->butregion = butregion; pup->butregion = butregion;
/* Operator context default same as menus, change if needed. */ /* Operator context default same as menus, change if needed. */
ui_popover_create_block(C, pup, WM_OP_EXEC_REGION_WIN); ui_popover_create_block(C, nullptr, pup, WM_OP_EXEC_REGION_WIN);
/* create in advance so we can let buttons point to retval already */ /* create in advance so we can let buttons point to retval already */
pup->block->handle = MEM_cnew<uiPopupBlockHandle>(__func__); pup->block->handle = MEM_cnew<uiPopupBlockHandle>(__func__);