godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-05 19:31:35 +00:00
Code Releases Wiki Activity

renamed _input_event for GUI events to _gui_input, so it's more differentiated than generalized _input

Browse Source
This commit is contained in:
Juan Linietsky
2017-01-08 16:28:12 -03:00
parent 0a59c3c3a6
commit 920947f297
117 changed files with 229 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/editor/plugins/animation_player_editor_plugin.cpp
View File

@@ -50,7 +50,7 @@ void AnimationPlayerEditor::_node_removed(Node *p_node) {
}
}
void AnimationPlayerEditor::_input_event(InputEvent p_event) {
void AnimationPlayerEditor::_gui_input(InputEvent p_event) {
}
@@ -1245,7 +1245,7 @@ void AnimationPlayerEditor::_unhandled_key_input(const InputEvent& p_ev) {
void AnimationPlayerEditor::_bind_methods() {
ClassDB::bind_method(_MD("_input_event"),&AnimationPlayerEditor::_input_event);
ClassDB::bind_method(_MD("_gui_input"),&AnimationPlayerEditor::_gui_input);
ClassDB::bind_method(_MD("_node_removed"),&AnimationPlayerEditor::_node_removed);
ClassDB::bind_method(_MD("_play_pressed"),&AnimationPlayerEditor::_play_pressed);
ClassDB::bind_method(_MD("_play_from_pressed"),&AnimationPlayerEditor::_play_from_pressed);

2
tools/editor/plugins/animation_player_editor_plugin.h
View File

@@ -171,7 +171,7 @@ class AnimationPlayerEditor : public VBoxContainer {
protected:
void _notification(int p_what);
void _input_event(InputEvent p_event);
void _gui_input(InputEvent p_event);
void _node_removed(Node *p_node);
static void _bind_methods();
public:

4
tools/editor/plugins/animation_tree_editor_plugin.cpp
View File

@@ -759,7 +759,7 @@ void AnimationTreeEditor::_node_edit_property(const StringName& p_node) {
}
#endif
void AnimationTreeEditor::_input_event(InputEvent p_event) {
void AnimationTreeEditor::_gui_input(InputEvent p_event) {
switch(p_event.type) {
@@ -1325,7 +1325,7 @@ void AnimationTreeEditor::_bind_methods() {
ClassDB::bind_method( "_add_menu_item", &AnimationTreeEditor::_add_menu_item );
ClassDB::bind_method( "_node_menu_item", &AnimationTreeEditor::_node_menu_item );
ClassDB::bind_method( "_input_event", &AnimationTreeEditor::_input_event );
ClassDB::bind_method( "_gui_input", &AnimationTreeEditor::_gui_input );
// ClassDB::bind_method( "_node_param_changed", &AnimationTreeEditor::_node_param_changed );
ClassDB::bind_method( "_scroll_moved", &AnimationTreeEditor::_scroll_moved );
ClassDB::bind_method( "_edit_dialog_changeds", &AnimationTreeEditor::_edit_dialog_changeds );

2
tools/editor/plugins/animation_tree_editor_plugin.h
View File

@@ -160,7 +160,7 @@ class AnimationTreeEditor : public Control {
protected:
void _notification(int p_what);
void _input_event(InputEvent p_event);
void _gui_input(InputEvent p_event);
static void _bind_methods();
public:

8
tools/editor/plugins/canvas_item_editor_plugin.cpp
View File

@@ -1064,7 +1064,7 @@ void CanvasItemEditor::_list_select(const InputEventMouseButton& b) {
}
void CanvasItemEditor::_viewport_input_event(const InputEvent& p_event) {
void CanvasItemEditor::_viewport_gui_input(const InputEvent& p_event) {
{
@@ -1072,7 +1072,7 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent& p_event) {
EditorPluginList *over_plugin_list = en->get_editor_plugins_over();
if (!over_plugin_list->empty()) {
bool discard = over_plugin_list->forward_input_event(transform,p_event);
bool discard = over_plugin_list->forward_gui_input(transform,p_event);
if (discard) {
accept_event();
return;
@@ -3209,7 +3209,7 @@ void CanvasItemEditor::_bind_methods() {
ClassDB::bind_method("_keying_changed",&CanvasItemEditor::_keying_changed);
ClassDB::bind_method("_unhandled_key_input",&CanvasItemEditor::_unhandled_key_input);
ClassDB::bind_method("_viewport_draw",&CanvasItemEditor::_viewport_draw);
ClassDB::bind_method("_viewport_input_event",&CanvasItemEditor::_viewport_input_event);
ClassDB::bind_method("_viewport_gui_input",&CanvasItemEditor::_viewport_gui_input);
ClassDB::bind_method("_snap_changed",&CanvasItemEditor::_snap_changed);
ClassDB::bind_method(_MD("_selection_result_pressed"),&CanvasItemEditor::_selection_result_pressed);
ClassDB::bind_method(_MD("_selection_menu_hide"),&CanvasItemEditor::_selection_menu_hide);
@@ -3351,7 +3351,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
viewport->add_child(h_scroll);
viewport->add_child(v_scroll);
viewport->connect("draw",this,"_viewport_draw");
viewport->connect("input_event",this,"_viewport_input_event");
viewport->connect("gui_input",this,"_viewport_gui_input");
h_scroll->connect("value_changed", this,"_update_scroll",Vector<Variant>(),true);

2
tools/editor/plugins/canvas_item_editor_plugin.h
View File

@@ -353,7 +353,7 @@ class CanvasItemEditor : public VBoxContainer {
void _unhandled_key_input(const InputEvent& p_ev);
void _viewport_input_event(const InputEvent& p_event);
void _viewport_gui_input(const InputEvent& p_event);
void _viewport_draw();
void _focus_selection(int p_op);

2
tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp
View File

@@ -99,7 +99,7 @@ void CollisionPolygon2DEditor::_wip_close() {
edited_point=-1;
}
bool CollisionPolygon2DEditor::forward_input_event(const InputEvent& p_event) {
bool CollisionPolygon2DEditor::forward_gui_input(const InputEvent& p_event) {
if (!node)

4
tools/editor/plugins/collision_polygon_2d_editor_plugin.h
View File

@@ -81,7 +81,7 @@ protected:
static void _bind_methods();
public:
bool forward_input_event(const InputEvent& p_event);
bool forward_gui_input(const InputEvent& p_event);
void edit(Node *p_collision_polygon);
CollisionPolygon2DEditor(EditorNode *p_editor);
};
@@ -95,7 +95,7 @@ class CollisionPolygon2DEditorPlugin : public EditorPlugin {
public:
virtual bool forward_canvas_input_event(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return collision_polygon_editor->forward_input_event(p_event); }
virtual bool forward_canvas_gui_input(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return collision_polygon_editor->forward_gui_input(p_event); }
virtual String get_name() const { return "CollisionPolygon2D"; }
bool has_main_screen() const { return false; }

2
tools/editor/plugins/collision_polygon_editor_plugin.cpp
View File

@@ -109,7 +109,7 @@ void CollisionPolygonEditor::_wip_close() {
}
bool CollisionPolygonEditor::forward_spatial_input_event(Camera* p_camera,const InputEvent& p_event) {
bool CollisionPolygonEditor::forward_spatial_gui_input(Camera* p_camera,const InputEvent& p_event) {
if (!node)
return false;

4
tools/editor/plugins/collision_polygon_editor_plugin.h
View File

@@ -92,7 +92,7 @@ protected:
static void _bind_methods();
public:
virtual bool forward_spatial_input_event(Camera* p_camera,const InputEvent& p_event);
virtual bool forward_spatial_gui_input(Camera* p_camera,const InputEvent& p_event);
void edit(Node *p_collision_polygon);
CollisionPolygonEditor(EditorNode *p_editor);
~CollisionPolygonEditor();
@@ -107,7 +107,7 @@ class CollisionPolygonEditorPlugin : public EditorPlugin {
public:
virtual bool forward_spatial_input_event(Camera* p_camera,const InputEvent& p_event) { return collision_polygon_editor->forward_spatial_input_event(p_camera,p_event); }
virtual bool forward_spatial_gui_input(Camera* p_camera,const InputEvent& p_event) { return collision_polygon_editor->forward_spatial_gui_input(p_camera,p_event); }
virtual String get_name() const { return "CollisionPolygon"; }
bool has_main_screen() const { return false; }

2
tools/editor/plugins/collision_shape_2d_editor_plugin.cpp
View File

@@ -303,7 +303,7 @@ void CollisionShape2DEditor::commit_handle(int idx, Variant& p_org) {
undo_redo->commit_action();
}
bool CollisionShape2DEditor::forward_input_event(const InputEvent& p_event) {
bool CollisionShape2DEditor::forward_gui_input(const InputEvent& p_event) {
if (!node) {
return false;

4
tools/editor/plugins/collision_shape_2d_editor_plugin.h
View File

@@ -73,7 +73,7 @@ protected:
static void _bind_methods();
public:
bool forward_input_event(const InputEvent& p_event);
bool forward_gui_input(const InputEvent& p_event);
void edit(Node* p_node);
CollisionShape2DEditor(EditorNode* p_editor);
@@ -86,7 +86,7 @@ class CollisionShape2DEditorPlugin : public EditorPlugin {
EditorNode* editor;
public:
virtual bool forward_canvas_input_event(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return collision_shape_2d_editor->forward_input_event(p_event); }
virtual bool forward_canvas_gui_input(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return collision_shape_2d_editor->forward_gui_input(p_event); }
virtual String get_name() const { return "CollisionShape2D"; }
bool has_main_screen() const { return false; }

2
tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
View File

@@ -102,7 +102,7 @@ void LightOccluder2DEditor::_wip_close(bool p_closed) {
edited_point=-1;
}
bool LightOccluder2DEditor::forward_input_event(const InputEvent& p_event) {
bool LightOccluder2DEditor::forward_gui_input(const InputEvent& p_event) {
if (!node)

4
tools/editor/plugins/light_occluder_2d_editor_plugin.h
View File

@@ -85,7 +85,7 @@ protected:
public:
Vector2 snap_point(const Vector2& p_point) const;
bool forward_input_event(const InputEvent& p_event);
bool forward_gui_input(const InputEvent& p_event);
void edit(Node *p_collision_polygon);
LightOccluder2DEditor(EditorNode *p_editor);
};
@@ -99,7 +99,7 @@ class LightOccluder2DEditorPlugin : public EditorPlugin {
public:
virtual bool forward_canvas_input_event(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return collision_polygon_editor->forward_input_event(p_event); }
virtual bool forward_canvas_gui_input(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return collision_polygon_editor->forward_gui_input(p_event); }
virtual String get_name() const { return "LightOccluder2D"; }
bool has_main_screen() const { return false; }

4
tools/editor/plugins/material_editor_plugin.cpp
View File

@@ -3,7 +3,7 @@
#if 0
void MaterialEditor::_input_event(InputEvent p_event) {
void MaterialEditor::_gui_input(InputEvent p_event) {
}
@@ -93,7 +93,7 @@ void MaterialEditor::_button_pressed(Node* p_button) {
void MaterialEditor::_bind_methods() {
ClassDB::bind_method(_MD("_input_event"),&MaterialEditor::_input_event);
ClassDB::bind_method(_MD("_gui_input"),&MaterialEditor::_gui_input);
ClassDB::bind_method(_MD("_button_pressed"),&MaterialEditor::_button_pressed);
}

2
tools/editor/plugins/material_editor_plugin.h
View File

@@ -39,7 +39,7 @@ class MaterialEditor : public Control {
protected:
void _notification(int p_what);
void _input_event(InputEvent p_event);
void _gui_input(InputEvent p_event);
static void _bind_methods();
public:

4
tools/editor/plugins/mesh_editor_plugin.cpp
View File

@@ -29,7 +29,7 @@
#include "mesh_editor_plugin.h"
#if 0
void MeshEditor::_input_event(InputEvent p_event) {
void MeshEditor::_gui_input(InputEvent p_event) {
if (p_event.type==InputEvent::MOUSE_MOTION && p_event.mouse_motion.button_mask&BUTTON_MASK_LEFT) {
@@ -136,7 +136,7 @@ void MeshEditor::_button_pressed(Node* p_button) {
void MeshEditor::_bind_methods() {
ClassDB::bind_method(_MD("_input_event"),&MeshEditor::_input_event);
ClassDB::bind_method(_MD("_gui_input"),&MeshEditor::_gui_input);
ClassDB::bind_method(_MD("_button_pressed"),&MeshEditor::_button_pressed);
}

2
tools/editor/plugins/mesh_editor_plugin.h
View File

@@ -65,7 +65,7 @@ class MeshEditor : public Control {
void _update_rotation();
protected:
void _notification(int p_what);
void _input_event(InputEvent p_event);
void _gui_input(InputEvent p_event);
static void _bind_methods();
public:

2
tools/editor/plugins/navigation_polygon_editor_plugin.cpp
View File

@@ -116,7 +116,7 @@ void NavigationPolygonEditor::_wip_close() {
edited_point=-1;
}
bool NavigationPolygonEditor::forward_input_event(const InputEvent& p_event) {
bool NavigationPolygonEditor::forward_gui_input(const InputEvent& p_event) {
if (!node)

4
tools/editor/plugins/navigation_polygon_editor_plugin.h
View File

@@ -87,7 +87,7 @@ protected:
static void _bind_methods();
public:
bool forward_input_event(const InputEvent& p_event);
bool forward_gui_input(const InputEvent& p_event);
void edit(Node *p_collision_polygon);
NavigationPolygonEditor(EditorNode *p_editor);
};
@@ -101,7 +101,7 @@ class NavigationPolygonEditorPlugin : public EditorPlugin {
public:
virtual bool forward_canvas_input_event(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return collision_polygon_editor->forward_input_event(p_event); }
virtual bool forward_canvas_gui_input(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return collision_polygon_editor->forward_gui_input(p_event); }
virtual String get_name() const { return "NavigationPolygonInstance"; }
bool has_main_screen() const { return false; }

2
tools/editor/plugins/path_2d_editor_plugin.cpp
View File

@@ -62,7 +62,7 @@ void Path2DEditor::_node_removed(Node *p_node) {
}
bool Path2DEditor::forward_input_event(const InputEvent& p_event) {
bool Path2DEditor::forward_gui_input(const InputEvent& p_event) {
if (!node)
return false;

4
tools/editor/plugins/path_2d_editor_plugin.h
View File

@@ -94,7 +94,7 @@ protected:
static void _bind_methods();
public:
bool forward_input_event(const InputEvent& p_event);
bool forward_gui_input(const InputEvent& p_event);
void edit(Node *p_path2d);
Path2DEditor(EditorNode *p_editor);
};
@@ -108,7 +108,7 @@ class Path2DEditorPlugin : public EditorPlugin {
public:
virtual bool forward_canvas_input_event(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return path2d_editor->forward_input_event(p_event); }
virtual bool forward_canvas_gui_input(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return path2d_editor->forward_gui_input(p_event); }
virtual String get_name() const { return "Path2D"; }
bool has_main_screen() const { return false; }

2
tools/editor/plugins/path_editor_plugin.cpp
View File

@@ -285,7 +285,7 @@ Ref<SpatialEditorGizmo> PathEditorPlugin::create_spatial_gizmo(Spatial* p_spatia
return Ref<SpatialEditorGizmo>();
}
bool PathEditorPlugin::forward_spatial_input_event(Camera* p_camera,const InputEvent& p_event) {
bool PathEditorPlugin::forward_spatial_gui_input(Camera* p_camera,const InputEvent& p_event) {
if (!path)
return false;

4
tools/editor/plugins/path_editor_plugin.h
View File

@@ -81,9 +81,9 @@ public:
static PathEditorPlugin* singleton;
Ref<FixedSpatialMaterial> path_material;
Ref<FixedSpatialMaterial> path_thin_material;
virtual bool forward_spatial_input_event(Camera* p_camera,const InputEvent& p_event);
virtual bool forward_spatial_gui_input(Camera* p_camera,const InputEvent& p_event);
// virtual bool forward_input_event(const InputEvent& p_event) { return collision_polygon_editor->forward_input_event(p_event); }
// virtual bool forward_gui_input(const InputEvent& p_event) { return collision_polygon_editor->forward_gui_input(p_event); }
virtual Ref<SpatialEditorGizmo> create_spatial_gizmo(Spatial* p_spatial);
virtual String get_name() const { return "Path"; }
bool has_main_screen() const { return false; }

4
tools/editor/plugins/polygon_2d_editor_plugin.cpp
View File

@@ -216,7 +216,7 @@ void Polygon2DEditor::_wip_close() {
edited_point=-1;
}
bool Polygon2DEditor::forward_input_event(const InputEvent& p_event) {
bool Polygon2DEditor::forward_gui_input(const InputEvent& p_event) {
if (node==NULL)
return false;
@@ -975,7 +975,7 @@ Polygon2DEditor::Polygon2DEditor(EditorNode *p_editor) {
uv_hscroll->connect("value_changed",this,"_uv_scroll_changed");
uv_edit_draw->connect("draw",this,"_uv_draw");
uv_edit_draw->connect("input_event",this,"_uv_input");
uv_edit_draw->connect("gui_input",this,"_uv_input");
uv_draw_zoom=1.0;
uv_drag_index=-1;
uv_drag=false;

4
tools/editor/plugins/polygon_2d_editor_plugin.h
View File

@@ -137,7 +137,7 @@ protected:
public:
bool forward_input_event(const InputEvent& p_event);
bool forward_gui_input(const InputEvent& p_event);
void edit(Node *p_collision_polygon);
Polygon2DEditor(EditorNode *p_editor);
};
@@ -151,7 +151,7 @@ class Polygon2DEditorPlugin : public EditorPlugin {
public:
virtual bool forward_canvas_input_event(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return collision_polygon_editor->forward_input_event(p_event); }
virtual bool forward_canvas_gui_input(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return collision_polygon_editor->forward_gui_input(p_event); }
virtual String get_name() const { return "Polygon2D"; }
bool has_main_screen() const { return false; }

4
tools/editor/plugins/resource_preloader_editor_plugin.cpp
View File

@@ -34,7 +34,7 @@
void ResourcePreloaderEditor::_input_event(InputEvent p_event) {
void ResourcePreloaderEditor::_gui_input(InputEvent p_event) {
}
@@ -381,7 +381,7 @@ void ResourcePreloaderEditor::drop_data_fw(const Point2& p_point,const Variant&
void ResourcePreloaderEditor::_bind_methods() {
ClassDB::bind_method(_MD("_input_event"),&ResourcePreloaderEditor::_input_event);
ClassDB::bind_method(_MD("_gui_input"),&ResourcePreloaderEditor::_gui_input);
ClassDB::bind_method(_MD("_load_pressed"),&ResourcePreloaderEditor::_load_pressed);
ClassDB::bind_method(_MD("_item_edited"),&ResourcePreloaderEditor::_item_edited);
ClassDB::bind_method(_MD("_delete_pressed"),&ResourcePreloaderEditor::_delete_pressed);

2
tools/editor/plugins/resource_preloader_editor_plugin.h
View File

@@ -74,7 +74,7 @@ class ResourcePreloaderEditor : public PanelContainer {
protected:
void _notification(int p_what);
void _input_event(InputEvent p_event);
void _gui_input(InputEvent p_event);
static void _bind_methods();
public:

4
tools/editor/plugins/sample_editor_plugin.cpp
View File

@@ -35,7 +35,7 @@
void SampleEditor::_input_event(InputEvent p_event) {
void SampleEditor::_gui_input(InputEvent p_event) {
}
@@ -348,7 +348,7 @@ void SampleEditor::edit(Ref<Sample> p_sample) {
void SampleEditor::_bind_methods() {
ClassDB::bind_method(_MD("_input_event"),&SampleEditor::_input_event);
ClassDB::bind_method(_MD("_gui_input"),&SampleEditor::_gui_input);
ClassDB::bind_method(_MD("_play_pressed"),&SampleEditor::_play_pressed);
ClassDB::bind_method(_MD("_stop_pressed"),&SampleEditor::_stop_pressed);

2
tools/editor/plugins/sample_editor_plugin.h
View File

@@ -57,7 +57,7 @@ class SampleEditor : public Panel {
protected:
void _notification(int p_what);
void _input_event(InputEvent p_event);
void _gui_input(InputEvent p_event);
static void _bind_methods();
public:

4
tools/editor/plugins/sample_library_editor_plugin.cpp
View File

@@ -35,7 +35,7 @@
#include "sample_editor_plugin.h"
void SampleLibraryEditor::_input_event(InputEvent p_event) {
void SampleLibraryEditor::_gui_input(InputEvent p_event) {
}
@@ -411,7 +411,7 @@ void SampleLibraryEditor::drop_data_fw(const Point2& p_point,const Variant& p_da
void SampleLibraryEditor::_bind_methods() {
ClassDB::bind_method(_MD("_input_event"),&SampleLibraryEditor::_input_event);
ClassDB::bind_method(_MD("_gui_input"),&SampleLibraryEditor::_gui_input);
ClassDB::bind_method(_MD("_load_pressed"),&SampleLibraryEditor::_load_pressed);
ClassDB::bind_method(_MD("_item_edited"),&SampleLibraryEditor::_item_edited);
ClassDB::bind_method(_MD("_delete_pressed"),&SampleLibraryEditor::_delete_pressed);

2
tools/editor/plugins/sample_library_editor_plugin.h
View File

@@ -74,7 +74,7 @@ class SampleLibraryEditor : public Panel {
protected:
void _notification(int p_what);
void _input_event(InputEvent p_event);
void _gui_input(InputEvent p_event);
static void _bind_methods();
public:

4
tools/editor/plugins/script_editor_plugin.cpp
View File

@@ -183,7 +183,7 @@ void ScriptEditorQuickOpen::_sbox_input(const InputEvent& p_ie) {
p_ie.key.scancode == KEY_PAGEUP ||
p_ie.key.scancode == KEY_PAGEDOWN ) ) {
search_options->call("_input_event",p_ie);
search_options->call("_gui_input",p_ie);
search_box->accept_event();
}
@@ -258,7 +258,7 @@ ScriptEditorQuickOpen::ScriptEditorQuickOpen() {
search_box = memnew( LineEdit );
vbc->add_margin_child(TTR("Search:"),search_box);
search_box->connect("text_changed",this,"_text_changed");
search_box->connect("input_event",this,"_sbox_input");
search_box->connect("gui_input",this,"_sbox_input");
search_options = memnew( Tree );
vbc->add_margin_child(TTR("Matches:"),search_options,true);
get_ok()->set_text(TTR("Open"));

6
tools/editor/plugins/script_text_editor.cpp
View File

@@ -979,7 +979,7 @@ void ScriptTextEditor::_bind_methods() {
ClassDB::bind_method("_edit_option",&ScriptTextEditor::_edit_option);
ClassDB::bind_method("_goto_line",&ScriptTextEditor::_goto_line);
ClassDB::bind_method("_lookup_symbol",&ScriptTextEditor::_lookup_symbol);
ClassDB::bind_method("_text_edit_input_event", &ScriptTextEditor::_text_edit_input_event);
ClassDB::bind_method("_text_edit_gui_input", &ScriptTextEditor::_text_edit_gui_input);
ClassDB::bind_method("_color_changed", &ScriptTextEditor::_color_changed);
@@ -1159,7 +1159,7 @@ void ScriptTextEditor::drop_data_fw(const Point2& p_point,const Variant& p_data,
}
void ScriptTextEditor::_text_edit_input_event(const InputEvent& ev) {
void ScriptTextEditor::_text_edit_gui_input(const InputEvent& ev) {
if (ev.type == InputEvent::MOUSE_BUTTON) {
InputEventMouseButton mb = ev.mouse_button;
if (mb.button_index == BUTTON_RIGHT && !mb.pressed) {
@@ -1269,7 +1269,7 @@ ScriptTextEditor::ScriptTextEditor() {
code_editor->get_text_edit()->set_select_identifiers_on_hover(true);
code_editor->get_text_edit()->set_context_menu_enabled(false);
code_editor->get_text_edit()->connect("input_event", this, "_text_edit_input_event");
code_editor->get_text_edit()->connect("gui_input", this, "_text_edit_gui_input");
context_menu = memnew(PopupMenu);
add_child(context_menu);

2
tools/editor/plugins/script_text_editor.h
View File

@@ -105,7 +105,7 @@ protected:
void _edit_option(int p_op);
void _make_context_menu(bool p_selection, bool p_color);
void _text_edit_input_event(const InputEvent& ev);
void _text_edit_gui_input(const InputEvent& ev);
void _color_changed(const Color& p_color);
void _goto_line(int p_line) { goto_line(p_line); }

8
tools/editor/plugins/shader_graph_editor_plugin.cpp
View File

@@ -37,7 +37,7 @@
#include "os/keyboard.h"
#include "canvas_item_editor_plugin.h"
void GraphColorRampEdit::_input_event(const InputEvent& p_event) {
void GraphColorRampEdit::_gui_input(const InputEvent& p_event) {
if (p_event.type==InputEvent::KEY && p_event.key.pressed && p_event.key.scancode==KEY_DELETE && grabbed!=-1) {
@@ -296,7 +296,7 @@ Vector<Color> GraphColorRampEdit::get_colors() const{
void GraphColorRampEdit::_bind_methods(){
ClassDB::bind_method(_MD("_input_event"),&GraphColorRampEdit::_input_event);
ClassDB::bind_method(_MD("_gui_input"),&GraphColorRampEdit::_gui_input);
ClassDB::bind_method(_MD("_color_changed"),&GraphColorRampEdit::_color_changed);
ADD_SIGNAL(MethodInfo("ramp_changed"));
}
@@ -316,7 +316,7 @@ GraphColorRampEdit::GraphColorRampEdit(){
}
////////////
void GraphCurveMapEdit::_input_event(const InputEvent& p_event) {
void GraphCurveMapEdit::_gui_input(const InputEvent& p_event) {
if (p_event.type==InputEvent::KEY && p_event.key.pressed && p_event.key.scancode==KEY_DELETE && grabbed!=-1) {
@@ -658,7 +658,7 @@ Vector<Vector2> GraphCurveMapEdit::get_points() const {
void GraphCurveMapEdit::_bind_methods(){
ClassDB::bind_method(_MD("_input_event"),&GraphCurveMapEdit::_input_event);
ClassDB::bind_method(_MD("_gui_input"),&GraphCurveMapEdit::_gui_input);
ADD_SIGNAL(MethodInfo("curve_changed"));
}

4
tools/editor/plugins/shader_graph_editor_plugin.h
View File

@@ -70,7 +70,7 @@ class GraphColorRampEdit : public Control {
void _color_changed(const Color& p_color);
protected:
void _input_event(const InputEvent& p_event);
void _gui_input(const InputEvent& p_event);
void _notification(int p_what);
static void _bind_methods();
public:
@@ -104,7 +104,7 @@ class GraphCurveMapEdit : public Control {
void _plot_curve(const Vector2& p_a,const Vector2& p_b,const Vector2& p_c,const Vector2& p_d);
protected:
void _input_event(const InputEvent& p_event);
void _gui_input(const InputEvent& p_event);
void _notification(int p_what);
static void _bind_methods();
public:

10
tools/editor/plugins/spatial_editor_plugin.cpp
View File

@@ -824,7 +824,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
EditorPluginList *over_plugin_list = en->get_editor_plugins_over();
if (!over_plugin_list->empty()) {
bool discard = over_plugin_list->forward_spatial_input_event(camera,p_event);
bool discard = over_plugin_list->forward_spatial_gui_input(camera,p_event);
if (discard)
return;
}
@@ -1852,7 +1852,7 @@ void SpatialEditorViewport::_notification(int p_what) {
if (p_what==NOTIFICATION_ENTER_TREE) {
surface->connect("draw",this,"_draw");
surface->connect("input_event",this,"_sinput");
surface->connect("gui_input",this,"_sinput");
surface->connect("mouse_enter",this,"_smouseenter");
preview_camera->set_icon(get_icon("Camera","EditorIcons"));
_init_gizmo_instance(index);
@@ -3505,7 +3505,7 @@ void SpatialEditor::_unhandled_key_input(InputEvent p_event) {
EditorNode *en = editor;
EditorPluginList *over_plugin_list = en->get_editor_plugins_over();
if (!over_plugin_list->empty() && over_plugin_list->forward_input_event(p_event)) {
if (!over_plugin_list->empty() && over_plugin_list->forward_gui_input(p_event)) {
return; //ate the over input event
}
@@ -3702,7 +3702,7 @@ void SpatialEditor::_node_removed(Node* p_node) {
void SpatialEditor::_bind_methods() {
// ClassDB::bind_method("_input_event",&SpatialEditor::_input_event);
// ClassDB::bind_method("_gui_input",&SpatialEditor::_gui_input);
ClassDB::bind_method("_unhandled_key_input",&SpatialEditor::_unhandled_key_input);
ClassDB::bind_method("_node_removed",&SpatialEditor::_node_removed);
ClassDB::bind_method("_menu_item_pressed",&SpatialEditor::_menu_item_pressed);
@@ -4007,7 +4007,7 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) {
settings_light_base = memnew( ViewportContainer );
settings_light_base->set_custom_minimum_size(Size2(128,128));
settings_light_base->connect("input_event",this,"_default_light_angle_input");
settings_light_base->connect("gui_input",this,"_default_light_angle_input");
settings_vbc->add_margin_child(TTR("Default Light Normal:"),settings_light_base);
settings_light_vp = memnew( Viewport );
settings_light_vp->set_disable_input(true);

2
tools/editor/plugins/spatial_editor_plugin.h
View File

@@ -481,7 +481,7 @@ protected:
void _notification(int p_what);
//void _input_event(InputEvent p_event);
//void _gui_input(InputEvent p_event);
void _unhandled_key_input(InputEvent p_event);
static void _bind_methods();

4
tools/editor/plugins/sprite_frames_editor_plugin.cpp
View File

@@ -35,7 +35,7 @@
void SpriteFramesEditor::_input_event(InputEvent p_event) {
void SpriteFramesEditor::_gui_input(InputEvent p_event) {
}
@@ -754,7 +754,7 @@ void SpriteFramesEditor::drop_data_fw(const Point2& p_point,const Variant& p_dat
void SpriteFramesEditor::_bind_methods() {
ClassDB::bind_method(_MD("_input_event"),&SpriteFramesEditor::_input_event);
ClassDB::bind_method(_MD("_gui_input"),&SpriteFramesEditor::_gui_input);
ClassDB::bind_method(_MD("_load_pressed"),&SpriteFramesEditor::_load_pressed);
ClassDB::bind_method(_MD("_empty_pressed"),&SpriteFramesEditor::_empty_pressed);
ClassDB::bind_method(_MD("_empty2_pressed"),&SpriteFramesEditor::_empty2_pressed);

2
tools/editor/plugins/sprite_frames_editor_plugin.h
View File

@@ -104,7 +104,7 @@ class SpriteFramesEditor : public PanelContainer {
protected:
void _notification(int p_what);
void _input_event(InputEvent p_event);
void _gui_input(InputEvent p_event);
static void _bind_methods();
public:

4
tools/editor/plugins/texture_editor_plugin.cpp
View File

@@ -4,7 +4,7 @@
#include "globals.h"
#include "tools/editor/editor_settings.h"
void TextureEditor::_input_event(InputEvent p_event) {
void TextureEditor::_gui_input(InputEvent p_event) {
}
@@ -84,7 +84,7 @@ void TextureEditor::edit(Ref<Texture> p_texture) {
void TextureEditor::_bind_methods() {
ClassDB::bind_method(_MD("_input_event"),&TextureEditor::_input_event);
ClassDB::bind_method(_MD("_gui_input"),&TextureEditor::_gui_input);
}

2
tools/editor/plugins/texture_editor_plugin.h
View File

@@ -17,7 +17,7 @@ class TextureEditor : public Control {
protected:
void _notification(int p_what);
void _input_event(InputEvent p_event);
void _gui_input(InputEvent p_event);
static void _bind_methods();
public:

2
tools/editor/plugins/texture_region_editor_plugin.cpp
View File

@@ -921,7 +921,7 @@ TextureRegionEditor::TextureRegionEditor(EditorNode* p_editor)
hscroll->connect("value_changed",this,"_scroll_changed");
edit_draw->connect("draw",this,"_region_draw");
edit_draw->connect("input_event",this,"_region_input");
edit_draw->connect("gui_input",this,"_region_input");
draw_zoom=1.0;
updating_scroll=false;

6
tools/editor/plugins/tile_map_editor_plugin.cpp
View File

@@ -189,7 +189,7 @@ void TileMapEditor::_sbox_input(const InputEvent& p_ie) {
p_ie.key.scancode == KEY_PAGEUP ||
p_ie.key.scancode == KEY_PAGEDOWN ) ) {
palette->call("_input_event", p_ie);
palette->call("_gui_input", p_ie);
search_box->accept_event();
}
}
@@ -595,7 +595,7 @@ static inline Vector<Point2i> line(int x0, int x1, int y0, int y1) {
return points;
}
bool TileMapEditor::forward_input_event(const InputEvent& p_event) {
bool TileMapEditor::forward_gui_input(const InputEvent& p_event) {
if (!node || !node->get_tileset().is_valid() || !node->is_visible())
return false;
@@ -1441,7 +1441,7 @@ TileMapEditor::TileMapEditor(EditorNode *p_editor) {
search_box->set_h_size_flags(SIZE_EXPAND_FILL);
search_box->connect("text_entered", this, "_text_entered");
search_box->connect("text_changed", this, "_text_changed");
search_box->connect("input_event", this, "_sbox_input");
search_box->connect("gui_input", this, "_sbox_input");
add_child(search_box);
size_slider = memnew( HSlider );

4
tools/editor/plugins/tile_map_editor_plugin.h
View File

@@ -175,7 +175,7 @@ public:
HBoxContainer *get_toolbar() const { return toolbar; }
bool forward_input_event(const InputEvent& p_event);
bool forward_gui_input(const InputEvent& p_event);
void edit(Node *p_tile_map);
TileMapEditor(EditorNode *p_editor);
@@ -190,7 +190,7 @@ class TileMapEditorPlugin : public EditorPlugin {
public:
virtual bool forward_canvas_input_event(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return tile_map_editor->forward_input_event(p_event); }
virtual bool forward_canvas_gui_input(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return tile_map_editor->forward_gui_input(p_event); }
virtual String get_name() const { return "TileMap"; }
bool has_main_screen() const { return false; }