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

Fix T83539: 'activate_init' fails with buttons that have popups

Browse Source 
Activating buttons was running too early, before the popup was
positioned on the screen,
causing data-selectors to be positioned incorrectly.

As the early button activation isn't needed, remove this call.

Ensure this doesn't happen again with an assert.
This commit is contained in:
Campbell Barton
2021-01-28 16:12:43 +11:00
parent 93412cb4e7
commit 10e093b30d
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/interface/interface.c
View File

@@ -988,6 +988,11 @@ bool UI_but_active_only(const bContext *C, ARegion *region, uiBlock *block, uiBu
*/ */
bool UI_block_active_only_flagged_buttons(const bContext *C, ARegion *region, uiBlock *block) bool UI_block_active_only_flagged_buttons(const bContext *C, ARegion *region, uiBlock *block)
{ {
/* Running this command before end-block has run, means buttons that open menus
* wont have those menus correctly positioned, see T83539. */
BLI_assert(block->endblock != 0);
bool done = false; bool done = false;
LISTBASE_FOREACH (uiBut *, but, &block->buttons) { LISTBASE_FOREACH (uiBut *, but, &block->buttons) {
if (but->flag & UI_BUT_ACTIVATE_ON_INIT) { if (but->flag & UI_BUT_ACTIVATE_ON_INIT) {

2
source/blender/windowmanager/intern/wm_operators.c
View File

@@ -1403,8 +1403,6 @@ static uiBlock *wm_block_dialog_create(bContext *C, ARegion *region, void *userD
UI_block_bounds_set_popup( UI_block_bounds_set_popup(
block, 6 * U.dpi_fac, (const int[2]){data->width / -2, data->height / 2}); block, 6 * U.dpi_fac, (const int[2]){data->width / -2, data->height / 2});
UI_block_active_only_flagged_buttons(C, region, block);
return block; return block;
} }