1 files changed, 12 insertions, 102 deletions

diff --git a/editor/action_map_editor.h b/editor/action_map_editor.h
index 36d21fe258..d56ee6f9eb 100644
--- a/editor/action_map_editor.h
+++ b/editor/action_map_editor.h
@@ -31,109 +31,16 @@
 #ifndef ACTION_MAP_EDITOR_H
 #define ACTION_MAP_EDITOR_H
 
-#include "scene/gui/check_box.h"
-#include "scene/gui/check_button.h"
-#include "scene/gui/color_rect.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/label.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/tab_container.h"
-#include "scene/gui/tree.h"
-
-// Confirmation Dialog used when configuring an input event.
-// Separate from ActionMapEditor for code cleanliness and separation of responsibilities.
-class InputEventConfigurationDialog : public ConfirmationDialog {
-	GDCLASS(InputEventConfigurationDialog, ConfirmationDialog);
+#include "scene/gui/control.h"
 
-public:
-	enum InputType {
-		INPUT_KEY = 1,
-		INPUT_MOUSE_BUTTON = 2,
-		INPUT_JOY_BUTTON = 4,
-		INPUT_JOY_MOTION = 8
-	};
-
-private:
-	struct IconCache {
-		Ref<Texture2D> keyboard;
-		Ref<Texture2D> mouse;
-		Ref<Texture2D> joypad_button;
-		Ref<Texture2D> joypad_axis;
-	} icon_cache;
-
-	Ref<InputEvent> event = Ref<InputEvent>();
-
-	TabContainer *tab_container = nullptr;
-
-	// Listening for input
-	Label *event_as_text = nullptr;
-	Panel *mouse_detection_rect = nullptr;
-
-	// List of All Key/Mouse/Joypad input options.
-	int allowed_input_types;
-	Tree *input_list_tree = nullptr;
-	LineEdit *input_list_search = nullptr;
-
-	// Additional Options, shown depending on event selected
-	VBoxContainer *additional_options_container = nullptr;
-
-	HBoxContainer *device_container = nullptr;
-	OptionButton *device_id_option = nullptr;
-
-	HBoxContainer *mod_container = nullptr; // Contains the subcontainer and the store command checkbox.
-
-	enum ModCheckbox {
-		MOD_ALT,
-		MOD_SHIFT,
-		MOD_CTRL,
-		MOD_META,
-		MOD_MAX
-	};
-#if defined(MACOS_ENABLED)
-	String mods[MOD_MAX] = { "Option", "Shift", "Ctrl", "Command" };
-#elif defined(WINDOWS_ENABLED)
-	String mods[MOD_MAX] = { "Alt", "Shift", "Ctrl", "Windows" };
-#else
-	String mods[MOD_MAX] = { "Alt", "Shift", "Ctrl", "Meta" };
-#endif
-	String mods_tip[MOD_MAX] = { "Alt or Option key", "Shift key", "Control key", "Meta/Windows or Command key" };
-
-	CheckBox *mod_checkboxes[MOD_MAX];
-	CheckBox *autoremap_command_or_control_checkbox = nullptr;
-
-	CheckBox *physical_key_checkbox = nullptr;
-
-	void _set_event(const Ref<InputEvent> &p_event, bool p_update_input_list_selection = true);
-
-	void _tab_selected(int p_tab);
-	void _listen_window_input(const Ref<InputEvent> &p_event);
-
-	void _search_term_updated(const String &p_term);
-	void _update_input_list();
-	void _input_list_item_selected();
-
-	void _mod_toggled(bool p_checked, int p_index);
-	void _autoremap_command_or_control_toggled(bool p_checked);
-	void _physical_keycode_toggled(bool p_checked);
-
-	void _device_selection_changed(int p_option_button_index);
-	void _set_current_device(int p_device);
-	int _get_current_device() const;
-	String _get_device_string(int p_device) const;
-
-protected:
-	void _notification(int p_what);
-
-public:
-	// Pass an existing event to configure it. Alternatively, pass no event to start with a blank configuration.
-	void popup_and_configure(const Ref<InputEvent> &p_event = Ref<InputEvent>());
-	Ref<InputEvent> get_event() const;
-	String get_event_text(const Ref<InputEvent> &p_event, bool p_include_device) const;
-
-	void set_allowed_input_types(int p_type_masks);
-
-	InputEventConfigurationDialog();
-};
+class Button;
+class HBoxContainer;
+class EventListenerLineEdit;
+class LineEdit;
+class CheckButton;
+class AcceptDialog;
+class InputEventConfigurationDialog;
+class Tree;
 
 class ActionMapEditor : public Control {
 	GDCLASS(ActionMapEditor, Control);
@@ -174,6 +81,7 @@ private:
 	bool show_builtin_actions = false;
 	CheckButton *show_builtin_actions_checkbutton = nullptr;
 	LineEdit *action_list_search = nullptr;
+	EventListenerLineEdit *action_list_search_by_event = nullptr;
 
 	HBoxContainer *add_hbox = nullptr;
 	LineEdit *add_edit = nullptr;
@@ -191,6 +99,8 @@ private:
 	void _tree_button_pressed(Object *p_item, int p_column, int p_id, MouseButton p_button);
 	void _tree_item_activated();
 	void _search_term_updated(const String &p_search_term);
+	void _search_by_event(const Ref<InputEvent> &p_event);
+	bool _should_display_action(const String &p_name, const Array &p_events) const;
 
 	Variant get_drag_data_fw(const Point2 &p_point, Control *p_from);
 	bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;