diff options
| author | Juan Linietsky | 2017-01-12 00:51:08 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-01-12 00:51:08 -0300 |
| commit | 83cb84753fb17d0c3e4dbe15388279ee93f97e3e (patch) | |
| tree | 202b22d5061cc3b79d2ffca8280d50e1ad107a72 /tools/editor/plugins | |
| parent | c84d618b4ea944e5c386d21f45265f9cb6fa783e (diff) | |
| download | godot-83cb84753fb17d0c3e4dbe15388279ee93f97e3e.tar.gz godot-83cb84753fb17d0c3e4dbe15388279ee93f97e3e.tar.zst godot-83cb84753fb17d0c3e4dbe15388279ee93f97e3e.zip | |
Renamed most signals so they refer to:
-An action being requested to the user in present tense: (ie, draw, gui_input, etc)
-A notification that an action happened, in past tense (ie, area_entered, modal_closed, etc).
Diffstat (limited to 'tools/editor/plugins')
| -rw-r--r-- | tools/editor/plugins/canvas_item_editor_plugin.cpp | 4 | ||||
| -rw-r--r-- | tools/editor/plugins/spatial_editor_plugin.cpp | 8 | ||||
| -rw-r--r-- | tools/editor/plugins/texture_region_editor_plugin.cpp | 10 | ||||
| -rw-r--r-- | tools/editor/plugins/tile_map_editor_plugin.cpp | 16 |
4 files changed, 19 insertions, 19 deletions
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp index 5fce9f8f5..1abbac453 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.cpp +++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp @@ -3971,9 +3971,9 @@ void CanvasItemEditorViewport::drop_data(const Point2& p_point,const Variant& p_ void CanvasItemEditorViewport::_notification(int p_what) { if (p_what==NOTIFICATION_ENTER_TREE) { - connect("mouse_exit",this,"_on_mouse_exit"); + connect("mouse_exited",this,"_on_mouse_exit"); } else if (p_what==NOTIFICATION_EXIT_TREE) { - disconnect("mouse_exit",this,"_on_mouse_exit"); + disconnect("mouse_exited",this,"_on_mouse_exit"); } } diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index 6a1098bc6..f508ab95c 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -1853,7 +1853,7 @@ void SpatialEditorViewport::_notification(int p_what) { surface->connect("draw",this,"_draw"); surface->connect("gui_input",this,"_sinput"); - surface->connect("mouse_enter",this,"_smouseenter"); + surface->connect("mouse_entered",this,"_smouseenter"); preview_camera->set_icon(get_icon("Camera","EditorIcons")); _init_gizmo_instance(index); } @@ -2150,7 +2150,7 @@ void SpatialEditorViewport::_toggle_camera_preview(bool p_activate) { if (!p_activate) { - previewing->disconnect("exit_tree",this,"_preview_exited_scene"); + previewing->disconnect("tree_exited",this,"_preview_exited_scene"); previewing=NULL; VS::get_singleton()->viewport_attach_camera( viewport->get_viewport(), camera->get_camera() ); //restore if (!preview) @@ -2161,7 +2161,7 @@ void SpatialEditorViewport::_toggle_camera_preview(bool p_activate) { } else { previewing=preview; - previewing->connect("exit_tree",this,"_preview_exited_scene"); + previewing->connect("tree_exited",this,"_preview_exited_scene"); VS::get_singleton()->viewport_attach_camera( viewport->get_viewport(), preview->get_camera() ); //replace view_menu->hide(); surface->update(); @@ -2266,7 +2266,7 @@ void SpatialEditorViewport::set_state(const Dictionary& p_state) { Node *pv = EditorNode::get_singleton()->get_edited_scene()->get_node(p_state["previewing"]); if (pv && pv->cast_to<Camera>()) { previewing=pv->cast_to<Camera>(); - previewing->connect("exit_tree",this,"_preview_exited_scene"); + previewing->connect("tree_exited",this,"_preview_exited_scene"); VS::get_singleton()->viewport_attach_camera( viewport->get_viewport(), previewing->get_camera() ); //replace view_menu->hide(); surface->update(); diff --git a/tools/editor/plugins/texture_region_editor_plugin.cpp b/tools/editor/plugins/texture_region_editor_plugin.cpp index 15fe95075..50e2cfb19 100644 --- a/tools/editor/plugins/texture_region_editor_plugin.cpp +++ b/tools/editor/plugins/texture_region_editor_plugin.cpp @@ -653,17 +653,17 @@ void TextureRegionEditor::edit(Object *p_obj) p_obj->connect("texture_changed",this,"_edit_region"); } p_obj->add_change_receptor(this); - p_obj->connect("exit_tree",this,"_node_removed",varray(p_obj),CONNECT_ONESHOT); + p_obj->connect("tree_exited",this,"_node_removed",varray(p_obj),CONNECT_ONESHOT); _edit_region(); } else { if(node_sprite) - node_sprite->disconnect("exit_tree",this,"_node_removed"); + node_sprite->disconnect("tree_exited",this,"_node_removed"); else if(node_patch9) - node_patch9->disconnect("exit_tree",this,"_node_removed"); + node_patch9->disconnect("tree_exited",this,"_node_removed"); else if(obj_styleBox.is_valid()) - obj_styleBox->disconnect("exit_tree",this,"_node_removed"); + obj_styleBox->disconnect("tree_exited",this,"_node_removed"); else if(atlas_tex.is_valid()) - atlas_tex->disconnect("exit_tree",this,"_node_removed"); + atlas_tex->disconnect("tree_exited",this,"_node_removed"); node_sprite = NULL; node_patch9 = NULL; diff --git a/tools/editor/plugins/tile_map_editor_plugin.cpp b/tools/editor/plugins/tile_map_editor_plugin.cpp index 0d384ea3a..2c64f7cd8 100644 --- a/tools/editor/plugins/tile_map_editor_plugin.cpp +++ b/tools/editor/plugins/tile_map_editor_plugin.cpp @@ -1302,10 +1302,10 @@ void TileMapEditor::edit(Node *p_tile_map) { node=p_tile_map->cast_to<TileMap>(); if (!canvas_item_editor->is_connected("draw",this,"_canvas_draw")) canvas_item_editor->connect("draw",this,"_canvas_draw"); - if (!canvas_item_editor->is_connected("mouse_enter",this,"_canvas_mouse_enter")) - canvas_item_editor->connect("mouse_enter",this,"_canvas_mouse_enter"); - if (!canvas_item_editor->is_connected("mouse_exit",this,"_canvas_mouse_exit")) - canvas_item_editor->connect("mouse_exit",this,"_canvas_mouse_exit"); + if (!canvas_item_editor->is_connected("mouse_entered",this,"_canvas_mouse_enter")) + canvas_item_editor->connect("mouse_entered",this,"_canvas_mouse_enter"); + if (!canvas_item_editor->is_connected("mouse_exited",this,"_canvas_mouse_exit")) + canvas_item_editor->connect("mouse_exited",this,"_canvas_mouse_exit"); _update_palette(); @@ -1314,10 +1314,10 @@ void TileMapEditor::edit(Node *p_tile_map) { if (canvas_item_editor->is_connected("draw",this,"_canvas_draw")) canvas_item_editor->disconnect("draw",this,"_canvas_draw"); - if (canvas_item_editor->is_connected("mouse_enter",this,"_canvas_mouse_enter")) - canvas_item_editor->disconnect("mouse_enter",this,"_canvas_mouse_enter"); - if (canvas_item_editor->is_connected("mouse_exit",this,"_canvas_mouse_exit")) - canvas_item_editor->disconnect("mouse_exit",this,"_canvas_mouse_exit"); + if (canvas_item_editor->is_connected("mouse_entered",this,"_canvas_mouse_enter")) + canvas_item_editor->disconnect("mouse_entered",this,"_canvas_mouse_enter"); + if (canvas_item_editor->is_connected("mouse_exited",this,"_canvas_mouse_exit")) + canvas_item_editor->disconnect("mouse_exited",this,"_canvas_mouse_exit"); _update_palette(); } |
