Commit: 756b9acaf552bb82596f2239f522467372e4e661
Author: Campbell Barton
Date: Mon Jan 27 17:49:41 2020 +1100
Branches: blender-v2.82-release
https://developer.blender.org/rB756b9acaf552bb82596f2239f522467372e4e661
Fix T71719: Unrelated menus open on hover
Logic to open menus on hover changed since 2.7x for convenience
switching between popovers in the top-bar.
This also made hover open menus in situations where it isn't useful.
Restrict this to buttons placed side-by-side.
===================================================================
M source/blender/editors/interface/interface_handlers.c
===================================================================
diff --git a/source/blender/editors/interface/interface_handlers.c
b/source/blender/editors/interface/interface_handlers.c
index 05d5f03a363..089c87b86ed 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -10614,7 +10614,13 @@ static int ui_handler_region_menu(bContext *C, const
wmEvent *event, void *UNUSE
(ui_screen_region_find_mouse_over(screen, event) == NULL) &&
(ELEM(but->type, UI_BTYPE_PULLDOWN, UI_BTYPE_POPOVER, UI_BTYPE_MENU))
&&
(but_other = ui_but_find_mouse_over(ar, event)) && (but != but_other)
&&
- (ELEM(but_other->type, UI_BTYPE_PULLDOWN, UI_BTYPE_POPOVER,
UI_BTYPE_MENU))) {
+ (ELEM(but_other->type, UI_BTYPE_PULLDOWN, UI_BTYPE_POPOVER,
UI_BTYPE_MENU)) &&
+ /* Hover-opening menu's doesn't work well for buttons over one another
+ * along the same axis the menu is opening on (see T71719). */
+ (((data->menu->direction & (UI_DIR_LEFT | UI_DIR_RIGHT)) &&
+ BLI_rctf_isect_rect_x(&but->rect, &but_other->rect, NULL)) ||
+ ((data->menu->direction & (UI_DIR_DOWN | UI_DIR_UP)) &&
+ BLI_rctf_isect_rect_y(&but->rect, &but_other->rect, NULL)))) {
/* if mouse moves to a different root-level menu button,
* open it to replace the current menu */
if ((but_other->flag & UI_BUT_DISABLED) == 0) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
