[Bf-blender-cvs] [853a03c5555] master: Fix T58870: submenus don't open for some specific mouse positions.

[Brecht Van Lommel]

Commit: 853a03c555512db232636372dfbcdf3ec931bb48
Author: Brecht Van Lommel
Date:   Thu Jan 3 12:10:14 2019 +0100
Branches: master
https://developer.blender.org/rB853a03c555512db232636372dfbcdf3ec931bb48

Fix T58870: submenus don't open for some specific mouse positions.

===================================================================

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 9dc1f1e4e24..c48ff91e17c 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -8012,13 +8012,14 @@ static int ui_handle_button_event(bContext *C, const wmEvent *event, uiBut *but)
 			}
 			case TIMER:
 			{
-				/* handle menu auto open timer */
+				/* Handle menu auto open timer. */
 				if (event->customdata == data->autoopentimer) {
 					WM_event_remove_timer(data->wm, data->window, data->autoopentimer);
 					data->autoopentimer = NULL;
 
-					if (ui_but_contains_point_px(ar, but, event->x, event->y))
+					if (ui_but_contains_point_px(ar, but, event->x, event->y) || but->active) {
 						button_activate_state(C, but, BUTTON_STATE_MENU_OPEN);
+					}
 				}
 
 				break;