diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-23 00:47:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-23 00:47:52 +0100 |
| commit | e363f404a5605517b1b901a7c90986741bc29d22 (patch) | |
| tree | 5226cf7d645cd17f9dcde673a5ef5d229fdf1767 /editor/editor_settings.cpp | |
| parent | 668d6a1c5ccface4f4ecc95ce4cf00cd5d90b1db (diff) | |
| parent | 74bfe88267263297b43fef35fd9f32a91750d4d2 (diff) | |
Merge pull request #57000 from KoBeWi/UNLIMITED_PANNING
Diffstat (limited to 'editor/editor_settings.cpp')
| -rw-r--r-- | editor/editor_settings.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 2b98f46c17..0a0ebec5e0 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -643,10 +643,15 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { _initial_set("editors/2d/bone_outline_size", 2); _initial_set("editors/2d/viewport_border_color", Color(0.4, 0.4, 1.0, 0.4)); _initial_set("editors/2d/constrain_editor_view", true); - _initial_set("editors/2d/warped_mouse_panning", true); - _initial_set("editors/2d/simple_panning", false); - _initial_set("editors/2d/scroll_to_pan", false); - _initial_set("editors/2d/pan_speed", 20); + + // Panning + // Enum should be in sync with ControlScheme in ViewPanner. + EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "editors/panning/2d_editor_panning_scheme", 0, "Scroll Zooms,Scroll Pans"); + EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "editors/panning/sub_editor_panning_scheme", 0, "Scroll Zooms,Scroll Pans"); + EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "editors/panning/animation_editors_panning_scheme", 1, "Scroll Zooms,Scroll Pans"); + _initial_set("editors/panning/simple_panning", false); + _initial_set("editors/panning/warped_mouse_panning", true); + _initial_set("editors/panning/2d_editor_pan_speed", 20); // Tiles editor _initial_set("editors/tiles_editor/display_grid", true); |