diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-07-24 10:53:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-07-24 10:53:10 +0400 |
| commit | 1cbe85b156b318ee7d7445085c5b2af2212c0cfe (patch) | |
| tree | 13b1c7854ee88f261c80ef2af3a5e991b47af04d /source/blender/editors/interface/interface_handlers.c | |
| parent | cf521f198aa2209e9dee0315b1665f75f13217dd (diff) | |
UI: prevent dragging a popup from activating a button
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 0a1be6b9e66..a26c8dbe81d 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -7906,6 +7906,7 @@ static int ui_handle_menu_event( if (menu->is_grab) { if (event->type == LEFTMOUSE) { menu->is_grab = false; + retval = WM_UI_HANDLER_BREAK; } else { if (event->type == MOUSEMOVE) { @@ -8263,9 +8264,10 @@ static int ui_handle_menu_event( else if ((event->type == LEFTMOUSE) && (event->val == KM_PRESS) && (inside && is_floating && inside_title)) { - if (!ui_but_find_activated(ar)) { + if (!but || !ui_mouse_inside_button(ar, but, event->x, event->y)) { menu->is_grab = true; copy_v2_v2_int(menu->grab_xy_prev, &event->x); + retval = WM_UI_HANDLER_BREAK; } } #endif |