Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 10:31:15 +00:00
Code Issues Projects Releases Packages 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

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