diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-11 09:47:08 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-11 09:47:08 +0100 |
| commit | 9af4628bbeecbb3348b3a462da3efff342db153e (patch) | |
| tree | 5c1eda6a4e0766b1e8ffe6c9a3744097cc7e1b92 | |
| parent | baae87e307d0701a7b5e37dbbc6ea1e0f6cb012a (diff) | |
| parent | 3bf06e955e7e637ff6896019ecfe01e3023bfab6 (diff) | |
Merge pull request #71159 from EricEzaM/minor-input-configuration-fixes
Propagate allowed input types to `event_listener` when setting them on `InputEventConfigurationDialog`
| -rw-r--r-- | editor/event_listener_line_edit.cpp | 4 | ||||
| -rw-r--r-- | editor/event_listener_line_edit.h | 2 | ||||
| -rw-r--r-- | editor/input_event_configuration_dialog.cpp | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/editor/event_listener_line_edit.cpp b/editor/event_listener_line_edit.cpp index 3a99c4e264..274fe34c52 100644 --- a/editor/event_listener_line_edit.cpp +++ b/editor/event_listener_line_edit.cpp @@ -168,8 +168,8 @@ void EventListenerLineEdit::clear_event() { } } -void EventListenerLineEdit::set_allowed_input_types(int input_types) { - allowed_input_types = input_types; +void EventListenerLineEdit::set_allowed_input_types(int p_type_masks) { + allowed_input_types = p_type_masks; } int EventListenerLineEdit::get_allowed_input_types() const { diff --git a/editor/event_listener_line_edit.h b/editor/event_listener_line_edit.h index 0679733b6a..aa0cc91d47 100644 --- a/editor/event_listener_line_edit.h +++ b/editor/event_listener_line_edit.h @@ -67,7 +67,7 @@ public: Ref<InputEvent> get_event() const; void clear_event(); - void set_allowed_input_types(int input_types); + void set_allowed_input_types(int p_type_masks); int get_allowed_input_types() const; void grab_focus(); diff --git a/editor/input_event_configuration_dialog.cpp b/editor/input_event_configuration_dialog.cpp index b137f6f668..08d4bfff4a 100644 --- a/editor/input_event_configuration_dialog.cpp +++ b/editor/input_event_configuration_dialog.cpp @@ -515,6 +515,7 @@ Ref<InputEvent> InputEventConfigurationDialog::get_event() const { void InputEventConfigurationDialog::set_allowed_input_types(int p_type_masks) { allowed_input_types = p_type_masks; + event_listener->set_allowed_input_types(p_type_masks); } InputEventConfigurationDialog::InputEventConfigurationDialog() { |