Upgrade winit to 0.30.2 #4849
Upgrade winit to 0.30.2 #4849
Conversation
As per the example branch from Matt! Co-authored-by: mwcampbell <mattcampbell@pobox.com>
Also forgot to mark j-axa co-author ealier Co-authored-by: j-axa <josef.axa@gmail.com>
Update to latest `accesskit` and `accesskit_winit`
Tested on WSL wayland. Required an annoying workaround for nix/fs :/
emilk
added
eframe
|
I found a couple of issues during testing; added them under the |
In the previous code, new_events did check repaint times, this was lost in the translation. Seperate out this check from handle_event_result as we don't need the complexity of that whole shebang.
|
I've tested this on macOS, but we need some testing on Windows, X11 and Wayland too. A few things to test:
|
|
Thanks for the fixes! Done some more testing on Windows now (including all the above projects), and all seems to behave. (though there's a weird amount of latency for I can try a bit on WSL later but even before the winit patches it had all kinds of sketchy behaviour & crashes, so it won't say that much. Would be good to have someone who daily drives linux to test. |
|
@emilk Everything seems to be working on Linux X11 (openbox), apart from resizing in the egui demo app when the window is maximized. |
I tested it on Wayland (Cosmic desktop and Gnome-46) as well as X11 on Gnome-46. Everything seems to work.
|
|
Oh that's just the result of GNOME folks insisting that window decorations have to be done by the clients (applications), and not by the server (the compositor / window manager), lest they may be too consistent. 🙄 Window decorations look normal on KDE. |
|
Awesome - thanks for the help with the testing! Let's go 🚀 |
|
I just did a quick test of accessibility with a screen reader on Windows, and it looks good. Thanks @ArthurBrussee for getting this across the finish line. |
Since #4849, running `./scripts/check.sh` fails with: ``` ... error[E0277]: the trait bound `ActiveEventLoop: raw_window_handle::borrowed::HasDisplayHandle` is not satisfied --> crates/egui_glow/src/winit.rs:43:13 | 43 | event_loop, | ^^^^^^^^^^ the trait `raw_window_handle::borrowed::HasDisplayHandle` is not implemented for `ActiveEventLoop` | = help: the following other types implement trait `raw_window_handle::borrowed::HasDisplayHandle`: raw_window_handle::borrowed::DisplayHandle<'a> &H &mut H = note: required for the cast from `&ActiveEventLoop` to `&dyn raw_window_handle::borrowed::HasDisplayHandle` ``` This PR adds the missing `rwh_06` to the winit dependency (in egui-glow). * [x] I have followed the instructions in the PR template
Soon! ™️ @ArthurBrussee |
|
Oh nice! Though seems actually so far 0.30.5 doesn't have the fix this needs alas. Have asked there whether it still might be included. |
|
'Tis out! |
This updates winit to 0.30.5. #4849 Had to pin the version to 0.30.2, as a Winit patch changed the behavior of selecting a theme. Winit 0.30.5 reverts this, so we could stick with `window.theme()`, but the newly added `ActiveEventLoop::system_theme` is more like what egui wants anyway, as individual windows can have theme overrides. Also bump `smithay-clipboard` to prevent some now duplicate dependencies.
winit0.30 #4437ApplicationManagerapi #4709Hiya,
I need new winit for a specific fix for a android_native_actvity. There are already two PRs, but both don't seem to have a lot of movement, or are entirely complete:
#4466
Seems to have gone stale & is missing some bits.
#4702
Also seems stale (if less so), and is missing a refactor to run_on_demand. I also think the accesskit integration has a mistake and can't be enabled. I've marked them as a co-author on this as I started from this branch. (I think! Haven't done that on git before...).
Sorry for the wall of text but just dumping some details / thoughts here:
There's an issue with creating child windows in winit 0.30.1 and up on macOS. The multiple_viewports, "create immediate viewport" example crashes on anything later 0.30.1, with a stack overflow in unsafe code. I've create a winit issue, it might already be fixed in 0.31.0 but I can't test as 0.31 will likely require another refactoring. For now I have just pinned things to 0.30.0 exatly.
Winit has deprecated run_on_demand, instead requiring the ApplicationHandler interface. In 0.31.0 run_on_demand is removed. I've refactored both the integration and the WinitApp trait to follow this pattern. I've left user_events a bit more opaque, as it seems 0.31.0 is doing a rework of UserEvents too.
I've used the new lazy init approach for access kit from this branch https://github.com/mwcampbell/egui/tree/accesskit-new-lazy-init and marked Matt as co-author, thanks Matt!
There was very similair but not quite the same code for run_and_return and run_and_exit. I've merged them, but looking at the github issues graveyard it seems vey finnicky. I hope this is more robust than before but it's a bit scary.
when receiving new_events this also used to check the redraw timing dictionary. That doesn't seem necesarry so left this out, but that is a slight behaviour change?
I have reeneabled serial_windows on macOS. I wondered whether it was fixed after this PR and does seem to be! However, even before this PR it seems to work, so maybe winit has sorted things out before that... Windows also works fine now without the extra hack.
I've done a very basic test of AccessKit on Windows and screen reader seems ok but I'm really not knowleadgable enough to say whether it's all good or not.
I've tested cargo tests & all examples on Windows & macOS, and ran a basic Android app. Still, testing native platforms is wel... hard so if anyone can test linux / iOs / older mac versions / windows 10 would probably be a good idea!
For consistencys sake I've made all event like functions in WinitApp return a
Result<EventResult>. There's quite a bit of Ok-wrapping now, maybe too annoying? Not sure.Thank you for having a look!
Tested on
TODO
request_repaint_after