Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix inconsistency in 3D editor navigation #97104

Merged

Conversation

detomon
Copy link
Contributor

@detomon detomon commented Sep 17, 2024

Fixes #97103. Maybe fixes other inconsistencies with other input methods.

- Fix typo in orbit/zoom shortcut name
- Fix zoom when using trackpad
@detomon detomon requested a review from a team as a code owner September 17, 2024 09:48
NavigationMode change_nav_from_shortcut = _get_nav_mode_from_shortcut_check(NAVIGATION_LEFT_MOUSE, shortcut_check_sets, true);
if (change_nav_from_shortcut != NAVIGATION_NONE) {
nav_mode = change_nav_from_shortcut;
for (const ShortcutCheckSet &shortcut_check_set : shortcut_check_sets) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pan gesture has no mouse button and shortcuts can be empty (e.g., orbit), so _get_nav_mode_from_shortcut_check can't be used here.

Copy link
Member

@adamscott adamscott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems ok!

@akien-mga akien-mga merged commit a9dc9c3 into godotengine:master Sep 17, 2024
20 checks passed
@akien-mga
Copy link
Member

Thanks!

@detomon detomon deleted the fix-viewport-zoom-with-pan-gesture branch September 21, 2024 13:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Zooming in 3D editor does not work with trackpad
4 participants