diff options
| -rw-r--r-- | core/object.cpp | 6 | ||||
| -rw-r--r-- | core/object.h | 2 | ||||
| -rw-r--r-- | scene/2d/canvas_item.cpp | 13 | ||||
| -rw-r--r-- | scene/main/viewport.cpp | 47 |
4 files changed, 33 insertions, 35 deletions
diff --git a/core/object.cpp b/core/object.cpp index cbe24a49f3..34d6d8487a 100644 --- a/core/object.cpp +++ b/core/object.cpp @@ -1403,9 +1403,9 @@ bool Object::has_persistent_signal_connections() const { void Object::get_signals_connected_to_this(List<Connection> *p_connections) const { - for (const List<Connection>::Element *E=connections.front();E;E=E->next()) { - p_connections->push_back(E->get()); - } + for (const List<Connection>::Element *E=connections.front();E;E=E->next()) { + p_connections->push_back(E->get()); + } } diff --git a/core/object.h b/core/object.h index ce545a58e8..9359f4d4b2 100644 --- a/core/object.h +++ b/core/object.h @@ -605,7 +605,7 @@ public: void get_signal_connection_list(const StringName& p_signal,List<Connection> *p_connections) const; void get_all_signal_connections(List<Connection> *p_connections) const; bool has_persistent_signal_connections() const; - void get_signals_connected_to_this(List<Connection> *p_connections) const; + void get_signals_connected_to_this(List<Connection> *p_connections) const; Error connect(const StringName& p_signal, Object *p_to_object, const StringName& p_to_method,const Vector<Variant>& p_binds=Vector<Variant>(),uint32_t p_flags=0); void disconnect(const StringName& p_signal, Object *p_to_object, const StringName& p_to_method); diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp index 0c5886f755..17e5503a2d 100644 --- a/scene/2d/canvas_item.cpp +++ b/scene/2d/canvas_item.cpp @@ -460,9 +460,9 @@ void CanvasItem::_enter_canvas() { while(n) { - canvas_layer = n->cast_to<CanvasLayer>(); - if (canvas_layer) { - break; + canvas_layer = n->cast_to<CanvasLayer>(); + if (canvas_layer) { + break; } n=n->get_parent(); } @@ -471,7 +471,7 @@ void CanvasItem::_enter_canvas() { if (canvas_layer) canvas=canvas_layer->get_world_2d()->get_canvas(); else - canvas=get_viewport()->find_world_2d()->get_canvas(); + canvas=get_viewport()->find_world_2d()->get_canvas(); VisualServer::get_singleton()->canvas_item_set_parent(canvas_item,canvas); @@ -482,9 +482,8 @@ void CanvasItem::_enter_canvas() { } else { - CanvasItem *parent = get_parent_item(); - canvas_layer=parent->canvas_layer; + canvas_layer=parent->canvas_layer; VisualServer::get_singleton()->canvas_item_set_parent(canvas_item,parent->get_canvas_item()); parent->_queue_sort_children(); } @@ -1173,7 +1172,7 @@ Matrix32 CanvasItem::get_viewport_transform() const { return canvas_layer->get_transform(); } - } else { + } else { return get_viewport()->get_final_transform() * get_viewport()->get_canvas_transform(); } diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 49ecfee548..4083dc893d 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -1574,30 +1574,29 @@ void Viewport::_gui_call_input(Control *p_control,const InputEvent& p_input) { // _block(); - CanvasItem *ci=p_control; - while(ci) { - - Control *control = ci->cast_to<Control>(); - if (control) { - control->call_multilevel(SceneStringNames::get_singleton()->_input_event,p_input); - if (gui.key_event_accepted) - break; - if (!control->is_inside_tree()) - break; - control->emit_signal(SceneStringNames::get_singleton()->input_event,p_input); - if (!control->is_inside_tree() || control->is_set_as_toplevel()) { - break; - } - if (gui.key_event_accepted) - break; - if (control->data.stop_mouse && (p_input.type==InputEvent::MOUSE_BUTTON || p_input.type==InputEvent::MOUSE_MOTION)) - break; - } - - if (ci->is_set_as_toplevel()) - break; - - ci=ci->get_parent_item(); + CanvasItem *ci=p_control; + while(ci) { + + Control *control = ci->cast_to<Control>(); + if (control) { + control->call_multilevel(SceneStringNames::get_singleton()->_input_event,p_input); + if (gui.key_event_accepted) + break; + if (!control->is_inside_tree()) + break; + control->emit_signal(SceneStringNames::get_singleton()->input_event,p_input); + if (!control->is_inside_tree() || control->is_set_as_toplevel()) + break; + if (gui.key_event_accepted) + break; + if (control->data.stop_mouse && (p_input.type==InputEvent::MOUSE_BUTTON || p_input.type==InputEvent::MOUSE_MOTION)) + break; + } + + if (ci->is_set_as_toplevel()) + break; + + ci=ci->get_parent_item(); } //_unblock(); |