diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-08 16:28:12 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-08 16:28:12 -0300 |
| commit | 920947f297ff3b8d959d15c8e15e7a28dcbdb08f (patch) | |
| tree | 160ca184a2d8ec1a43238d25e10ef198bdd6b5c8 /scene/gui/scroll_container.cpp | |
| parent | 0a59c3c3a6a8c13a5c82d59d9587fca31f900604 (diff) | |
renamed _input_event for GUI events to _gui_input, so it's more differentiated than generalized _input
Diffstat (limited to 'scene/gui/scroll_container.cpp')
| -rw-r--r-- | scene/gui/scroll_container.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp index bef5746a63..966bad7604 100644 --- a/scene/gui/scroll_container.cpp +++ b/scene/gui/scroll_container.cpp @@ -79,14 +79,14 @@ void ScrollContainer::_cancel_drag() { drag_from=Vector2(); } -void ScrollContainer::_input_event(const InputEvent& p_input_event) { +void ScrollContainer::_gui_input(const InputEvent& p_gui_input) { - switch(p_input_event.type) { + switch(p_gui_input.type) { case InputEvent::MOUSE_BUTTON: { - const InputEventMouseButton &mb=p_input_event.mouse_button; + const InputEventMouseButton &mb=p_gui_input.mouse_button; if (mb.button_index==BUTTON_WHEEL_UP && mb.pressed) { if (h_scroll->is_visible() && !v_scroll->is_visible()){ @@ -158,7 +158,7 @@ void ScrollContainer::_input_event(const InputEvent& p_input_event) { } break; case InputEvent::MOUSE_MOTION: { - const InputEventMouseMotion &mm=p_input_event.mouse_motion; + const InputEventMouseMotion &mm=p_gui_input.mouse_motion; if (drag_touching && ! drag_touching_deaccel) { @@ -438,7 +438,7 @@ void ScrollContainer::set_h_scroll(int p_pos) { void ScrollContainer::_bind_methods() { ClassDB::bind_method(_MD("_scroll_moved"),&ScrollContainer::_scroll_moved); - ClassDB::bind_method(_MD("_input_event"),&ScrollContainer::_input_event); + ClassDB::bind_method(_MD("_gui_input"),&ScrollContainer::_gui_input); ClassDB::bind_method(_MD("set_enable_h_scroll","enable"),&ScrollContainer::set_enable_h_scroll); ClassDB::bind_method(_MD("is_h_scroll_enabled"),&ScrollContainer::is_h_scroll_enabled); ClassDB::bind_method(_MD("set_enable_v_scroll","enable"),&ScrollContainer::set_enable_v_scroll); |