Skip to content

Conversation

@lodetrick
Copy link
Contributor

@lodetrick lodetrick commented Nov 28, 2025

See #113024

This PR updates the SpriteFrames docks to use the new dock system. The layout is very horizontal but with some changes, it seems possible to make it vertical. That can be done in a follow-up PR.

This PR also contains a fix for transient docks, where it would be opened if the layout was saved while it was floating, leading to crash cases where the dock knew it wasn't editing anything, but it was able to be opened by loading the layout, so it was unsafely accessing the nullptr.

@lodetrick lodetrick requested a review from a team as a code owner November 28, 2025 11:36
@AThousandShips AThousandShips added this to the 4.x milestone Nov 28, 2025
@KoBeWi
Copy link
Member

KoBeWi commented Nov 28, 2025

Do you have stack trace for the crash?
Might be related to #113276

EDIT:
After reading it again, no, it's probably unrelated.

Comment on lines +616 to +618
if (!dock->transient) {
floating_docks_dump[name] = window_dump;
}
Copy link
Member

Choose a reason for hiding this comment

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

Instead of preventing the window from being saved, we could instead prevent loading it. It can help fix #113259 If you make a dock floating, it should stay floating.

Copy link
Member

Choose a reason for hiding this comment

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

This still needs to be addressed.

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.

3 participants