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

Reorganize EditorNode menu options #101093

Merged
merged 1 commit into from
Jan 9, 2025

Conversation

KoBeWi
Copy link
Member

@KoBeWi KoBeWi commented Jan 3, 2025

Inspired by #59442 (comment)

This PR moves around and renames various enum values from EditorNode. They are now organized by menu, listed in the order they appear, and consistently prefixed: FILE, PROJECT, EDITOR, HELP.

There were various "menu options" that weren't actually menu options, I changed them to methods. There were also some unused enum values, which I removed. I also moved some options used exclusively in scene tabs to EditorSceneTabs (they are still handled in EditorNode).

Some fake menu options were kept, because their logic is a bit tangled. We could rename them to use common prefix.

Comment on lines +162 to +149
FILE_UNDO,
FILE_REDO,
Copy link
Member Author

Choose a reason for hiding this comment

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

Renamed these 2 for consistency, but it does not look good. Though alternative is that they are the only 2 EDIT options.

Copy link
Member

@akien-mga akien-mga Jan 7, 2025

Choose a reason for hiding this comment

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

I think we can keep them as EDIT_UNDO / EDIT_REDO, that's clearer.

Edit: Ah wait I just understood, these are all entries in the "Scene" ("File"-like, menu). Then I guess the rename makes sense... but yeah it's not great.

FILE_QUIT also doesn't make too much sense so it's not too bad IMO.

@akien-mga akien-mga modified the milestones: 4.x, 4.4 Jan 7, 2025
@akien-mga
Copy link
Member

Needs rebase.

@KoBeWi
Copy link
Member Author

KoBeWi commented Jan 7, 2025

#101094 will conflict again, so I'll wait.

@KoBeWi KoBeWi force-pushed the infinite_menu_entropy branch from dcd2d1f to d724a06 Compare January 8, 2025 15:04
@akien-mga

This comment was marked as resolved.

@KoBeWi KoBeWi force-pushed the infinite_menu_entropy branch from d724a06 to 24eadaa Compare January 9, 2025 11:22
@akien-mga akien-mga merged commit 6d7ddfc into godotengine:master Jan 9, 2025
20 checks passed
@akien-mga
Copy link
Member

Thanks!

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.

2 participants