Add EditorDock's own DockSlot enum#114366
Merged
akien-mga merged 1 commit intogodotengine:masterfrom Jan 7, 2026
Merged
Conversation
KoBeWi
force-pushed
the
uh
branch
4 times, most recently
from
e96ddfb to
91955ab
Compare
Member
Yeah this probably makes sense to remove and have both enums in EditorDock. |
Member
Author
|
Should I make this change in this PR? It's internal only, so it can be done at any time. |
Member
|
Can be done in a follow-up I guess, there will likely be some include churn. |
akien-mga
approved these changes
Jan 7, 2026
Member
|
Thanks! |
Merged
rivie13
pushed a commit
to rivie13/Phoenix-Agentic-Engine
that referenced
this pull request
Feb 16, 2026
Add EditorDock's own DockSlot enum
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When EditorDock was added, it was using DockSlot from EditorPlugin. It was done for legacy reasons and to avoid duplicating that enum. However it doesn't really make sense for EditorDock to use enum from EditorPlugin, the old one should just get deprecated.
This PR introduces DockSlot in EditorDock. The
default_slotproperty was changed to use this enum (it's a new API in 4.6, so only affects plugins that have upgraded to the new system). Hopefully C++20 will allow to make the enums less duplicated (there is some new enum feature that might make it possible).I'm also thinking about removing DockConstants. They were added to avoid some cross-includes (I think?), but no such thing exists anymore so it's somewhat redundant.
EDIT:
The PR also has some include-related changes. EditorDock no longer needs to include EditorPlugin, and I also removed EditorDockManager includes from some headers.