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

Fix indentation issues in last commits 

Ping @reduz.
This commit is contained in:
Rémi Verschelde 2016-06-07 07:39:40 +02:00
parent 78218359b1
commit 0729c852b4
4 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/object.cpp
View File

@ -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());
}
}

2
core/object.h
View File

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

13
scene/2d/canvas_item.cpp
View File

@ -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();
}

41
scene/main/viewport.cpp
View File

@ -1574,30 +1574,29 @@ void Viewport::_gui_call_input(Control *p_control,const InputEvent& p_input) {
// _block();
CanvasItem *ci=p_control;
while(ci) {
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;
}
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;
if (ci->is_set_as_toplevel())
break;
ci=ci->get_parent_item();
ci=ci->get_parent_item();
}
//_unblock();