godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #71159 from EricEzaM/minor-input-configuration-fixes 

Propagate allowed input types to `event_listener` when setting them on `InputEventConfigurationDialog`
This commit is contained in:
Rémi Verschelde 2023-01-11 09:47:08 +01:00
parent baae87e307 3bf06e955e
commit 9af4628bbe
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/event_listener_line_edit.cpp
View File

@ -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 {

2
editor/event_listener_line_edit.h
View File

@ -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();

1
editor/input_event_configuration_dialog.cpp
View File

@ -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() {