Fix T70191: Text button in popup doesn't work
F2 rename didn't work with mouse input.
This commit is contained in:
parent
f9cc51788b
commit
2251c6e046
@ -7497,6 +7497,7 @@ static void button_activate_init(bContext *C, ARegion *ar, uiBut *but, uiButtonA
|
|||||||
data = MEM_callocN(sizeof(uiHandleButtonData), "uiHandleButtonData");
|
data = MEM_callocN(sizeof(uiHandleButtonData), "uiHandleButtonData");
|
||||||
data->wm = CTX_wm_manager(C);
|
data->wm = CTX_wm_manager(C);
|
||||||
data->window = CTX_wm_window(C);
|
data->window = CTX_wm_window(C);
|
||||||
|
BLI_assert(ar != NULL);
|
||||||
data->region = ar;
|
data->region = ar;
|
||||||
|
|
||||||
#ifdef USE_CONT_MOUSE_CORRECT
|
#ifdef USE_CONT_MOUSE_CORRECT
|
||||||
@ -8009,6 +8010,7 @@ void ui_but_execute_begin(struct bContext *UNUSED(C),
|
|||||||
*active_back = but->active;
|
*active_back = but->active;
|
||||||
data = MEM_callocN(sizeof(uiHandleButtonData), "uiHandleButtonData_Fake");
|
data = MEM_callocN(sizeof(uiHandleButtonData), "uiHandleButtonData_Fake");
|
||||||
but->active = data;
|
but->active = data;
|
||||||
|
BLI_assert(ar != NULL);
|
||||||
data->region = ar;
|
data->region = ar;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -334,7 +334,8 @@ int UI_popover_panel_invoke(bContext *C, const char *idname, bool keep_open, Rep
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (block) {
|
if (block) {
|
||||||
UI_block_active_only_flagged_buttons(C, CTX_wm_region(C), block);
|
uiPopupBlockHandle *handle = block->handle;
|
||||||
|
UI_block_active_only_flagged_buttons(C, handle->region, block);
|
||||||
}
|
}
|
||||||
return OPERATOR_INTERFACE;
|
return OPERATOR_INTERFACE;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user