diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-18 19:37:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-18 19:37:28 +0100 |
| commit | 7eb4e6415d74e3d4dae6ddd12bb0bdb7acf221c0 (patch) | |
| tree | eb3468f199205840a967b895593d5026f5e11b5f /editor/editor_settings.h | |
| parent | 5c2fe970b87f8e95306bad0f713567a150b1e442 (diff) | |
| parent | 49714b09635fddb3dbada703017482e732a4b459 (diff) | |
Merge pull request #43663 from EricEzaM/PR/INP4-dehardcode_scene_shortcuts
Remove hardcoded shortcuts from /scene and instead use the input action system to allow them to be customised.
Diffstat (limited to 'editor/editor_settings.h')
| -rw-r--r-- | editor/editor_settings.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/editor/editor_settings.h b/editor/editor_settings.h index 616a938a86..e5f8527faf 100644 --- a/editor/editor_settings.h +++ b/editor/editor_settings.h @@ -84,7 +84,8 @@ private: int last_order; Ref<Resource> clipboard; - Map<String, Ref<Shortcut>> shortcuts; + mutable Map<String, Ref<Shortcut>> shortcuts; + Map<String, List<Ref<InputEvent>>> builtin_action_overrides; String resource_path; String settings_dir; @@ -186,6 +187,9 @@ public: Ref<Shortcut> get_shortcut(const String &p_name) const; void get_shortcut_list(List<String> *r_shortcuts); + void set_builtin_action_override(const String &p_name, const Array &p_events); + const Array get_builtin_action_overrides(const String &p_name) const; + void notify_changes(); EditorSettings(); |