blender
/
blender
136
408
Fork 591
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

UI: Support "Adjust Last Operation" panel after file browser operation #118623

Open
Julian Eisel wants to merge 1 commits from JulianEisel/blender:temp-fileselect-redo-panel into main
pull from: JulianEisel/blender:temp-fileselect-redo-panel
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 1 Files Changed 1 +23 -3
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/windowmanager/intern/wm_event_system.cc
View File

@ -2630,7 +2630,7 @@ static eHandlerActionFlag wm_handler_operator_call(bContext *C,
return WM_HANDLER_BREAK;
}
static void wm_operator_free_for_fileselect(wmOperator *file_operator)
static void wm_operator_clear_fileselect(wmOperator *file_operator)
{
LISTBASE_FOREACH (bScreen *, screen, &G_MAIN->screens) {
LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
@ -2642,7 +2642,11 @@ static void wm_operator_free_for_fileselect(wmOperator *file_operator)
}
}
}
}
static void wm_operator_free_for_fileselect(wmOperator *file_operator)
{
wm_operator_clear_fileselect(file_operator);
WM_operator_free(file_operator);
}
@ -2848,9 +2852,25 @@ static eHandlerActionFlag wm_handler_fileselect_do(bContext *C,
if (retval & OPERATOR_FINISHED) {
WM_operator_last_properties_store(handler->op);
}
if (retval & (OPERATOR_CANCELLED | OPERATOR_FINISHED)) {
ED_area_type_hud_clear(wm, nullptr);
if (wm_operator_register_check(wm, handler->op->type)) {
wm_operator_register(C, handler->op);
WM_operator_region_active_win_set(C);
if (WM_operator_last_redo(C) == handler->op) {
/* Show the redo panel. */
ScrArea *area = CTX_wm_area(C);
if (area && ((area->flag & AREA_FLAG_OFFSCREEN) == 0)) {
ED_area_type_hud_ensure(C, area);
}
}
}
wm_operator_clear_fileselect(handler->op);
}
else if (retval & OPERATOR_CANCELLED) {
wm_operator_free_for_fileselect(handler->op);
}
}