Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-24 02:13:36 +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

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