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

[Windows] Make native dialogs non-cancelable and stay on top of parent. #101697

Merged
merged 1 commit into from
Jan 20, 2025

Conversation

bruvzg
Copy link
Member

@bruvzg bruvzg commented Jan 17, 2025

See #101689

  • Ensures dialog_show stay on top of parent and button indices do not overlap standard button codes (to make it non-cancelable, since TDCBF_CANCEL_BUTTON == 2 and was almost always present).
  • Ensures both dialog_show and dialog_input_text do not have a close button in the title bar.

Native dialogs on macOS have the same behavior.

@fire
Copy link
Member

fire commented Jan 17, 2025

This doesn't affect headless dialogues? I am trying to review the pull requests related to the stuck headless mode.

@bruvzg
Copy link
Member Author

bruvzg commented Jan 17, 2025

headless dialogues

No, headless mode use DisplayServerHeadless display driver not DisplayServerWindows (or other platform specific server), the only native dialog that can be shown in headless mode should be OS::alert.

Copy link
Member

@syntaxerror247 syntaxerror247 left a comment

Choose a reason for hiding this comment

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

I tested the changes, and it successfully resolve the issue.

@Repiteo Repiteo merged commit edaf14a into godotengine:master Jan 20, 2025
20 checks passed
@Repiteo
Copy link
Contributor

Repiteo commented Jan 20, 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.

4 participants