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: Update winit to 0.29.10 and egui to 0.25.0 #14703

Merged
merged 1 commit into from
Jan 16, 2024

Conversation

Dinnerbone
Copy link
Contributor

Supersedes #13731

Testing of text and key inputs is requested, everything changed about those.

@torokati44
Copy link
Member

I think the resizing logic also changed, at least on Linux+Wayland: We no longer get a resize event after setting the window size ourselves. AFAIK, will test.
Also, there was that hack to set the initial window size (which didn't work on Linux+Wayland), maybe that is no longer necessary...?

@torokati44
Copy link
Member

And thank you for taking this over! 😊

@torokati44
Copy link
Member

Unfortunately, does not (currently) fix #8870.

@n0samu
Copy link
Member

n0samu commented Jan 12, 2024

Unfortunately this breaks the Ctrl-A, Ctrl-C and Ctrl-V text control inputs implemented in #11059 😦

@Dinnerbone
Copy link
Contributor Author

Unfortunately this breaks the Ctrl-A, Ctrl-C and Ctrl-V text control inputs implemented in #11059 😦

Seems to have been an undocumented breaking change in egui. Opened emilk/egui#3812 and rebased this PR to use that for now

@torokati44
Copy link
Member

torokati44 commented Jan 12, 2024

I was wondering why cargo-deny didn't fail CI on this one - it's not supposed to allow new git crate sources to "randomly appear".
Turns out, it only warns about them. Which is fine, I guess.
Just for cleanliness' sake, I guess the cargo-deny config could be updated to allow the Dinnerbone GH organization as crate source.
While somewhat less related, we could also remove kyren, as we also get a warning about that, since we have since moved to a published release of gc-arena in #14616.
But all this can be a separate follow-up PR too. Maybe it should be. And there we could even turn these warnings into errors, so they won't fall out of sync again.

EDIT: There you go: #14730

@torokati44
Copy link
Member

torokati44 commented Jan 12, 2024

Cargo.lock should be updated for the latest commit in your egui branch before merging - it's not up to date at the moment.

EDIT: Or we can wait for the egui patch to be merged, and a bugfix release published.

desktop/src/app.rs Outdated Show resolved Hide resolved
desktop/src/app.rs Outdated Show resolved Hide resolved
@torokati44
Copy link
Member

torokati44 commented Jan 13, 2024

Oh, it seems like mouse move events are being passed to the movie even when I'm navigating the egui menu.
EDIT: This is not a new regression, it has been like that before. Just noticed now.

@torokati44
Copy link
Member

torokati44 commented Jan 15, 2024

Meanwhile, winit 0.29.10 just came out.

@Dinnerbone
Copy link
Contributor Author

Meanwhile, wgpu 0.29.10 just came out.

Winit

@torokati44
Copy link
Member

Yes, that.

@Dinnerbone Dinnerbone changed the title desktop: Update winit to 0.29.9 and egui to 0.25.0 desktop: Update winit to 0.29.10 and egui to 0.25.0 Jan 16, 2024
@Dinnerbone Dinnerbone merged commit f65060e into ruffle-rs:master Jan 16, 2024
13 checks passed
@torokati44
Copy link
Member

It's somewhat unfortunate that we have to switch to an egui fork, but it is what it is...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

3 participants