blender
/
blender
131
398
Fork 577
Code Issues 6.3k Pull Requests 743 Projects 19 Wiki Activity

UI: prevent dragging a popup from activating a button

This commit is contained in:
Campbell Barton 2014-07-24 16:53:10 +10:00
parent cf521f198a
commit 1cbe85b156
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/interface/interface_handlers.c
View File

@ -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