diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-12-31 00:33:07 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-12-31 00:33:07 -0300 |
| commit | 335c52ba03ecbccd0c9af8f9278b69da09a3e931 (patch) | |
| tree | 5e4f5e2ea0d735228de7733e2fb689abbc2bc9c9 /scene/gui/control.cpp | |
| parent | fd836cad270f7eb9645356cd583c8f11bf737b0f (diff) | |
| parent | ac13c8c0c6fc346462b21ee00139dddd2e4ec1e3 (diff) | |
| download | redot-engine-335c52ba03ecbccd0c9af8f9278b69da09a3e931.tar.gz | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'scene/gui/control.cpp')
| -rw-r--r-- | scene/gui/control.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index ec4886a6ac..6e867c45b9 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -916,6 +916,7 @@ void Control::_window_show_tooltip() { void Control::_window_call_input(Control *p_control,const InputEvent& p_input) { + _block(); while(p_control) { @@ -932,6 +933,9 @@ void Control::_window_call_input(Control *p_control,const InputEvent& p_input) { break; p_control=p_control->data.parent; } + + _unblock(); + } void Control::_window_input_event(InputEvent p_event) { @@ -1067,6 +1071,7 @@ void Control::_window_input_event(InputEvent p_event) { Size2 pos = mpos; pos = window->focus_inv_xform.xform(pos); + window->mouse_over->drop_data(pos,window->drag_data); window->drag_data=Variant(); //change mouse accordingly |