diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-21 13:03:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 13:03:32 +0100 |
| commit | 5a23136d1bdc88589ee7082098dadf74afef53c2 (patch) | |
| tree | 70f59ef74795849c2941db99d92ba61e36a5bf8a /main/input_default.cpp | |
| parent | ec4d467b4c5edac86af6aaab0545770377294346 (diff) | |
| parent | 80ad8afc85a90e6fda1b136b13c1eb42e35c115e (diff) | |
| download | redot-engine-5a23136d1bdc88589ee7082098dadf74afef53c2.tar.gz | |
Merge pull request #12573 from poke1024/macostouchpad
Native pan and zoom for macOS + InputEventGesture
Diffstat (limited to 'main/input_default.cpp')
| -rw-r--r-- | main/input_default.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp index 2940f432d5..7cc7521686 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -319,6 +319,15 @@ void InputDefault::parse_input_event(const Ref<InputEvent> &p_event) { set_joy_axis(jm->get_device(), jm->get_axis(), jm->get_axis_value()); } + Ref<InputEventGesture> ge = p_event; + + if (ge.is_valid()) { + + if (main_loop) { + main_loop->input_event(ge); + } + } + if (!p_event->is_echo()) { for (const Map<StringName, InputMap::Action>::Element *E = InputMap::get_singleton()->get_action_map().front(); E; E = E->next()) { |