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.

Sign up for GitHub

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

Jump to bottom

Make the single window mode check more strict #79793

Merged
merged 1 commit into from
Jul 25, 2023
Merged

Make the single window mode check more strict #79793

merged 1 commit into from
Jul 25, 2023

Conversation

trollodel
Copy link
Contributor

Fixes #79673

Turns out that SceneTree::is_embedding_subwindows() is false during editor initialization when the interface/editor/single_window_mode editor setting is true (didn't check where the setting is checked).
That's why is not reproducible with the --single-window command line flag.

@trollodel
Make the single window mode check more strict
0f6327b 
Check the "interface/editor/single_window_mode" editor settings.
@Sauermann
Copy link
Contributor

Sauermann commented Jul 22, 2023 •
edited
Loading

In its current form with this PR applied, the following actions still lead to a garbled dock as in the linked issue:

  1. Disable single window mode and restart (if necessary)
  2. Make the file-system dock floating
  3. Enable single window mode and restart
  4. Now the file-system dock appears garbled

@trollodel
Copy link
Contributor Author

This is a different, but related, issue. I remember that it worked before.
I'll check why it broke.

Sauermann
Sauermann approved these changes Jul 22, 2023
View reviewed changes
Copy link
Contributor

@Sauermann Sauermann left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I have tested the PR and it solves the problem in the linked issue by disallowing floating docks in single-window-mode.
I'm not familiar with that part of the code, but the changes seem reasonable.

@YuriSizov YuriSizov added this to the 4.2 milestone Jul 24, 2023
@YuriSizov YuriSizov added the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Jul 24, 2023
@YuriSizov YuriSizov merged commit fc1b392 into godotengine:master Jul 25, 2023
13 checks passed
@YuriSizov
Copy link
Contributor

Thanks!

@YuriSizov YuriSizov removed the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Sep 21, 2023
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.1.2.

@kitbdev kitbdev mentioned this pull request Oct 20, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Sauermann Sauermann Sauermann approved these changes

Assignees
No one assigned
Labels
bug topic:editor
Projects
None yet
Milestone
4.2
Development

Successfully merging this pull request may close these issues.

Floating Editor Dock unusable in Single Window Mode
4 participants
@trollodel @Sauermann @YuriSizov @AThousandShips