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 ruler tool sticks after right click #93174

Merged
merged 1 commit into from
Jun 20, 2024

Conversation

MannyFluss
Copy link
Contributor

@MannyFluss MannyFluss commented Jun 14, 2024

ruler tool prevents new nodes from being added while ruler is active.

@AThousandShips
Copy link
Member

Please make the PR title more descriptive, describing what you have done instead of what issue number you have fixed

@MannyFluss MannyFluss changed the title fixed issue #93043 fixed issue #93043, ruler tool no longer no longer stuck after right click Jun 14, 2024
@MannyFluss MannyFluss changed the title fixed issue #93043, ruler tool no longer no longer stuck after right click fixed issue #93043, ruler tool no longer stuck after right click Jun 14, 2024
@AThousandShips AThousandShips added this to the 4.3 milestone Jun 15, 2024
@AThousandShips AThousandShips changed the title fixed issue #93043, ruler tool no longer stuck after right click Fox ruler tool sticks after right click Jun 15, 2024
@AThousandShips AThousandShips requested a review from a team June 15, 2024 07:59
@Chaosus
Copy link
Member

Chaosus commented Jun 15, 2024

@AThousandShips Hm, fox? Maybe fix?

@AThousandShips AThousandShips changed the title Fox ruler tool sticks after right click Fix ruler tool sticks after right click Jun 15, 2024
@AThousandShips
Copy link
Member

Autocorrect strikes again!

@KoBeWi
Copy link
Member

KoBeWi commented Jun 17, 2024

I think right click should cancel the operation instead of doing nothing.

@MannyFluss
Copy link
Contributor Author

should it allow the add child popup menu to appear or just cancel the ruler

@KoBeWi
Copy link
Member

KoBeWi commented Jun 18, 2024

Just cancel.

Copy link
Member

@KoBeWi KoBeWi left a comment

Choose a reason for hiding this comment

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

Remember to squash the commits into 1.

@MannyFluss
Copy link
Contributor Author

how do I squash the commits into one? or is that for someone else to do.

@KoBeWi
Copy link
Member

KoBeWi commented Jun 19, 2024

See https://docs.godotengine.org/en/stable/contributing/workflow/pr_workflow.html#the-interactive-rebase

@MannyFluss
Copy link
Contributor Author

MannyFluss commented Jun 19, 2024

for future reference, should I should be using amends for small changes like this?

@KoBeWi
Copy link
Member

KoBeWi commented Jun 19, 2024

Having multiple commits make it easier to follow changes, but more difficult to resolve conflicts. At the end you are expected to squash into single commit anyway, so use what works better for you.
Also it's better to avoid accepting changes or rebasing using the GitHub buttons, because they make the PR more difficult to squash.

@MannyFluss
Copy link
Contributor Author

MannyFluss commented Jun 19, 2024

I have learned a lot from this, hopefully next pr I do goes a bit smoother! (also hopefully i didnt just jynx it)

@akien-mga akien-mga merged commit e536ab4 into godotengine:master Jun 20, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks! And congrats for your first merged Godot contribution 🎉

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.

Ruler tool stuck after right click
5 participants