blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 783 Projects 19 Wiki Activity

UI: Menu Status Text Clears Incorrectly #120351

Merged
Harley Acheson merged 1 commits from Harley/blender:MenuStatusText into main 2024-04-07 03:02:13 +02:00
Conversation 1 Commits 1 Files Changed 1 +10 -2
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/interface/regions/interface_region_popup.cc
View File

@ -895,8 +895,7 @@ uiPopupBlockHandle *ui_popup_block_create(bContext *C,
void ui_popup_block_free(bContext *C, uiPopupBlockHandle *handle)
{
/* This disables the status bar text that is set when opening a menu. */
ED_workspace_status_text(C, nullptr);
bool is_submenu = false;
/* 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. */
@ -909,9 +908,18 @@ void ui_popup_block_free(bContext *C, uiPopupBlockHandle *handle)
uiPopupBlockHandle *menu = block->handle;
menu->menuretval = UI_RETURN_OK;
}
if (ui_block_is_menu(block)) {
is_submenu = true;
}
}
}
/* Clear the status bar text that is set when opening a menu. */
if (!is_submenu) {
ED_workspace_status_text(C, nullptr);
}
if (handle->popup_create_vars.arg_free) {
handle->popup_create_vars.arg_free(handle->popup_create_vars.arg);
}