diff options
| author | Julian Eisel <julian@blender.org> | 2020-05-12 21:30:15 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-05-12 21:40:56 +0300 |
| commit | 36e3847093546232db3f16da9189ab7f30207126 (patch) | |
| tree | 820a3d6dc44df18e2843365be7c40778f5eefa75 /source/blender/editors/interface/interface_ops.c | |
| parent | fc59febb1b30f390e733e1c775b93d128dd84e34 (diff) | |
Fix T76635: Clicking the text button X in a pop-up doesn't clear
In this case giving `CTX_wm_menu()` priority over `CTX_wm_region()` is all
that's needed and makes sense (since we want exactly the hovered button, not
some other active button in the region/menu hierarchy).
The situation with pop-ups is still tricky, see T73565. But as a first step
it's probably good to let functions be more explicit about what they want when
querying UI context. So I added a variation of a UI-context function for cases
like this.
Diffstat (limited to 'source/blender/editors/interface/interface_ops.c')
| -rw-r--r-- | source/blender/editors/interface/interface_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index 9faa17beff7..909da434554 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -1679,7 +1679,7 @@ static void UI_OT_button_execute(wmOperatorType *ot) static int button_string_clear_exec(bContext *C, wmOperator *UNUSED(op)) { - uiBut *but = UI_context_active_but_get(C); + uiBut *but = UI_context_active_but_get_respect_menu(C); if (but) { ui_but_active_string_clear_and_exit(C, but); |