godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-restrict gui root from being removed while performing input, fixes #2578

Browse Source
This commit is contained in:
reduz 2015-12-29 10:01:29 -03:00
parent 45ad1024e1
commit 2f19260fb7
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scene/gui/control.cpp
View File

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

1
scene/main/node.cpp
View File

@ -802,6 +802,7 @@ void Node::remove_child(Node *p_child) {
}
ERR_FAIL_COND( idx==-1 );
ERR_FAIL_COND( p_child->data.blocked > 0 );
//if (data.scene) { does not matter