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

Reset TileMap editor drag_type when the toolbar mode is not selected #86066

Merged
merged 1 commit into from
Dec 14, 2023

Conversation

Wiltof
Copy link
Contributor

@Wiltof Wiltof commented Dec 12, 2023

this fixes : #85077

The problem made it so that the drag_type was kept until the toolbar mode SELECT was once again pressed. This made it so tilemap was drawing automatically without having to press down the left mouse button. By changing drag type to none when select is not used, this is fixed.

@akien-mga

This comment was marked as resolved.

@akien-mga akien-mga requested review from groud and KoBeWi December 12, 2023 10:30
@akien-mga akien-mga added the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label Dec 12, 2023
@Wiltof

This comment was marked as resolved.

@akien-mga

This comment was marked as resolved.

@Wiltof

This comment was marked as resolved.

@akien-mga

This comment was marked as resolved.

@akien-mga

This comment was marked as resolved.

@akien-mga akien-mga changed the title Fixes an issue where the tilemap editor's drag_type is not set to none when the toolbar's mode is changed Reset TileMap editor drag_type when the toolbar mode is not selected Dec 12, 2023
@Wiltof Wiltof requested review from a team as code owners December 12, 2023 12:01
@AThousandShips AThousandShips removed request for a team December 12, 2023 12:07
@akien-mga

This comment was marked as resolved.

@Wiltof
Copy link
Contributor Author

Wiltof commented Dec 12, 2023

Thank you so much for all your help, haha. I don't really understand how all those other commits showed up, but all's well that ends well

editor/plugins/tiles/tile_map_editor.cpp Outdated Show resolved Hide resolved
@groud
Copy link
Member

groud commented Dec 14, 2023

Looks good. Could you please squash the commit together ?

@Wiltof
Copy link
Contributor Author

Wiltof commented Dec 14, 2023

Looks good. Could you please squash the commit together ?

Done!

@YuriSizov YuriSizov merged commit a6c0c90 into godotengine:master Dec 14, 2023
15 checks passed
@YuriSizov
Copy link
Contributor

Thanks, and congrats on your first merged Godot contribution!

@YuriSizov YuriSizov removed the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label Jan 25, 2024
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.2.2.

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.

TileMap Painting by accident when switching between editor Select Mode (Q) and Move Mode (W)
5 participants