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

desktop: Set main window as parent of file pickers #17403

Merged
merged 1 commit into from
Aug 20, 2024

Conversation

kjarosh
Copy link
Member

@kjarosh kjarosh commented Aug 7, 2024

Related to #11336 a bit.

This patch makes sure that all file pickers are children of Ruffle. This way, file pickers will hover over the main window and will have to be dismissed before the user may interact with it.

Related functionality added in rfd:

@danielhjacobs
Copy link
Contributor

If this were to be merged before a release, you'd need to add PolyMeilex here:

ruffle/deny.toml

Lines 78 to 82 in 117df6e

github = [
"ruffle-rs",
# TODO: Remove once a release with https://github.com/emilk/egui/pull/4847 in it is out.
"emilk",
]

@kjarosh kjarosh force-pushed the file-picker-parent branch 3 times, most recently from 6e3971b to ce39201 Compare August 7, 2024 18:09
@kjarosh kjarosh added the A-desktop Area: Desktop Application label Aug 7, 2024
@kjarosh
Copy link
Member Author

kjarosh commented Aug 18, 2024

The PR PolyMeilex/rfd#209 has been merged, I think we can now consider switching to a commit from rfd's master.

@kjarosh kjarosh added the waiting-on-review Waiting on review from a Ruffle team member label Aug 18, 2024
Copy link
Collaborator

@evilpie evilpie left a comment

Choose a reason for hiding this comment

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

Not an expert on winit, but seems fine considering it compiles.

This patch makes sure that all file pickers are children of Ruffle.
This way, file pickers will hover over the main window and will have
to be dismissed before the user may interact with it.
@kjarosh
Copy link
Member Author

kjarosh commented Aug 20, 2024

Tested on both Wayland and X11, and it works flawlessly, merging

@kjarosh kjarosh merged commit 87bf7b5 into ruffle-rs:master Aug 20, 2024
17 checks passed
@kjarosh kjarosh deleted the file-picker-parent branch August 20, 2024 11:47
@evilpie evilpie removed the waiting-on-review Waiting on review from a Ruffle team member label Aug 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-desktop Area: Desktop Application
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants