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

Fix: allow panel drag-collapse in popovers and fix uiBut event handling

Browse Source 
Sets missing context menu region in popovers that is required to handle drag collapse
event.

Also fix layout panel header but events handling.

| Main | Fix |
| -------- | -------- |
| <video src="/attachments/03409a9f-751d-4b4c-b464-d62a65b9b477" title="2024-05-08 12-21-14.mp4" controls></video>     | <video src="/attachments/a50be151-8d5e-485d-bc47-3e2c7292c063" title="2024-05-08 12-18-08.mp4" controls></video>     |

Pull Request: https://projects.blender.org/blender/blender/pulls/121594
This commit is contained in:
Guillermo Venegas
2024-05-10 14:25:26 +02:00
committed by Jacques Lucke
parent f920d05820
commit 4b2f1b2829
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11425,7 +11425,7 @@ static int ui_handle_menus_recursive(bContext *C,
C, event, submenu, level + 1, is_parent_inside || inside, is_menu, false);
}
}
else if (event->val == KM_PRESS && event->type == LEFTMOUSE) {
else if (!but && event->val == KM_PRESS && event->type == LEFTMOUSE) {
LISTBASE_FOREACH (uiBlock *, block, &menu->region->uiblocks) {
if (block->panel) {
int mx = event->xy[0];
@@ -11438,7 +11438,12 @@ static int ui_handle_menus_recursive(bContext *C,
if (header) {
ED_region_tag_redraw(menu->region);
ED_region_tag_refresh_ui(menu->region);
ARegion *prev_region_popup = CTX_wm_region_popup(C);
/* Set the current context popup region so the handler context can access to it. */
CTX_wm_region_popup_set(C, menu->region);
UI_panel_drag_collapse_handler_add(C, !UI_layout_panel_toggle_open(C, header));
/* Restore previous popup region. */
CTX_wm_region_popup_set(C, prev_region_popup);
retval = WM_UI_HANDLER_BREAK;
}
}