griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #114436: Crash when right clicking certain, nested, popup dialogs

Browse Source 
`CTX_wm_region()` isn't reliable with popups. Handling should use
`uiHandleButtonData.region` instead, which respects popup regions.
This commit is contained in:
Julian Eisel
2023-11-06 21:51:43 +01:00
parent fe9e28c086
commit abe925d0c6
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/interface/interface_handlers.cc
View File

@@ -8047,16 +8047,15 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, const wmEvent *
(event->modifier & (KM_SHIFT | KM_CTRL | KM_ALT | KM_OSKEY)) == 0 &&
(event->val == KM_PRESS))
{
ARegion *region = CTX_wm_region(C);
/* For some button types that are typically representing entire sets of data, right-clicking
* to spawn the context menu should also activate the item. This makes it clear which item
* will be operated on.
* Apply the button immediately, so context menu polls get the right active item. */
uiBut *clicked_view_item_but = but->type == UI_BTYPE_VIEW_ITEM ?
but :
ui_view_item_find_mouse_over(region, event->xy);
ui_view_item_find_mouse_over(data->region, event->xy);
if (clicked_view_item_but) {
UI_but_execute(C, region, clicked_view_item_but);
UI_but_execute(C, data->region, clicked_view_item_but);
}
/* RMB has two options now */