Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-01-03 14:10:14 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-01-03 14:15:29 +0300
commit853a03c555512db232636372dfbcdf3ec931bb48 (patch)
tree6f76b3c935ccd716f5fb612bf31e7ae210157dd8 /source/blender/editors/interface
parent323543ae2ee1c1ad97545e93759ed4ff5d03a920 (diff)
Fix T58870: submenus don't open for some specific mouse positions.
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r--source/blender/editors/interface/interface_handlers.c5
1 files changed, 3 insertions, 2 deletions
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;