diff options
| author | Juan Linietsky | 2017-01-08 16:28:12 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-01-08 16:28:12 -0300 |
| commit | 920947f297ff3b8d959d15c8e15e7a28dcbdb08f (patch) | |
| tree | 160ca184a2d8ec1a43238d25e10ef198bdd6b5c8 /scene/gui/popup_menu.cpp | |
| parent | 0a59c3c3a6a8c13a5c82d59d9587fca31f900604 (diff) | |
| download | godot-920947f297ff3b8d959d15c8e15e7a28dcbdb08f.tar.gz godot-920947f297ff3b8d959d15c8e15e7a28dcbdb08f.tar.zst godot-920947f297ff3b8d959d15c8e15e7a28dcbdb08f.zip | |
Diffstat (limited to 'scene/gui/popup_menu.cpp')
| -rw-r--r-- | scene/gui/popup_menu.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index e4a03f6e2..c28c1cc61 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -215,7 +215,7 @@ void PopupMenu::_submenu_timeout() { } -void PopupMenu::_input_event(const InputEvent &p_event) { +void PopupMenu::_gui_input(const InputEvent &p_event) { switch( p_event.type) { @@ -308,7 +308,7 @@ void PopupMenu::_input_event(const InputEvent &p_event) { ie.type=InputEvent::MOUSE_MOTION; ie.mouse_motion.x=b.x; ie.mouse_motion.y=b.y+s; - _input_event(ie); + _gui_input(ie); } } break; case BUTTON_WHEEL_UP: { @@ -328,7 +328,7 @@ void PopupMenu::_input_event(const InputEvent &p_event) { ie.type=InputEvent::MOUSE_MOTION; ie.mouse_motion.x=b.x; ie.mouse_motion.y=b.y-s; - _input_event(ie); + _gui_input(ie); } @@ -1098,7 +1098,7 @@ void PopupMenu::clear_autohide_areas(){ void PopupMenu::_bind_methods() { - ClassDB::bind_method(_MD("_input_event"),&PopupMenu::_input_event); + ClassDB::bind_method(_MD("_gui_input"),&PopupMenu::_gui_input); ClassDB::bind_method(_MD("add_icon_item","texture","label","id","accel"),&PopupMenu::add_icon_item,DEFVAL(-1),DEFVAL(0)); ClassDB::bind_method(_MD("add_item","label","id","accel"),&PopupMenu::add_item,DEFVAL(-1),DEFVAL(0)); ClassDB::bind_method(_MD("add_icon_check_item","texture","label","id","accel"),&PopupMenu::add_icon_check_item,DEFVAL(-1),DEFVAL(0)); |