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

Allow dragging editable children #84310

Merged
merged 1 commit into from
Dec 4, 2023
Merged

Conversation

timothyqiu
Copy link
Member

Fixes #84144

Nodes from an instantiated scene was prevented from being dragged. This makes sense since editable children are not supposed to be rearrange. But it also prevents editable children from being dragged into other areas like the script editor and the Inspector.

This PR moves the "any node from an instantiated scene" check from when dragging to when dropping.

@timothyqiu timothyqiu added bug topic:editor usability cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release labels Nov 1, 2023
@timothyqiu timothyqiu added this to the 4.3 milestone Nov 1, 2023
@YuriSizov YuriSizov requested a review from a team November 1, 2023 14:13
But not allow dropping inside the scene tree editor.
Copy link
Member

@SaracenOne SaracenOne left a comment

Choose a reason for hiding this comment

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

Yeah, this makes perfect sense. Restricting dragging of editable children was an oversight. Tested and LGTM 👍

@akien-mga akien-mga merged commit 98882f1 into godotengine:master Dec 4, 2023
15 checks passed
@akien-mga
Copy link
Member

Thanks!

@timothyqiu timothyqiu deleted the dnd branch December 5, 2023 03:21
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.2.1.

@YuriSizov YuriSizov removed the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label Dec 5, 2023
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.

Editable Children cannot be drag-and-dropped into "@export var"s
5 participants