Skip to content

Make shader editor menu position consistent with script editor #105183

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

Merged
merged 1 commit into from
Apr 11, 2025

Conversation

lodetrick
Copy link
Contributor

@lodetrick lodetrick commented Apr 9, 2025

Currently, the shader editor has two modes, where the file menu button starts above the file list, then migrates to above the text editor when a file is selected, increasing the size of the file list vbox. This PR pulls the menu bars from the text editor above both the file list and the editor in order to be more consistent with the GDScript editor.

This PR also renames the properties left_panel -> main_container and main_split -> files_split to reflect this change in organization.

Iteration on #100287

Before:
Screenshot 2025-04-09 at 3 04 18 AM

After:
Screenshot 2025-04-09 at 3 02 26 AM

@lodetrick lodetrick requested a review from a team as a code owner April 9, 2025 10:11
@AThousandShips AThousandShips added this to the 4.x milestone Apr 9, 2025
@lodetrick lodetrick force-pushed the shader-ui-shuffle branch 2 times, most recently from 8df7d00 to 9466abc Compare April 9, 2025 17:44
@clayjohn clayjohn requested a review from a team April 9, 2025 18:42
@lodetrick lodetrick force-pushed the shader-ui-shuffle branch from 9466abc to 9c67a2d Compare April 9, 2025 18:47
Copy link
Member

@Calinou Calinou left a comment

Choose a reason for hiding this comment

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

Tested locally, it works as expected. Code looks good to me.

While this loses a bit of vertical screen real estate for the file list, this is more consistent with the script editor UX, so overall it's worth it.

@kitbdev
Copy link
Contributor

kitbdev commented Apr 10, 2025

When I tested it, I could not expand the shader editor view area.

image

@lodetrick lodetrick requested a review from kitbdev April 10, 2025 05:58
@Repiteo Repiteo modified the milestones: 4.x, 4.5 Apr 10, 2025
@Repiteo Repiteo merged commit 7b9c512 into godotengine:master Apr 11, 2025
20 checks passed
@Repiteo
Copy link
Contributor

Repiteo commented Apr 11, 2025

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.

6 participants