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

Bump winit to 0.30.0 and accesskit to 0.14.0 #4466

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

AndriBaal
Copy link

@AndriBaal AndriBaal commented May 6, 2024

Here is a summary of the changes I made:

  • Bump accesskit to version 0.14.0
  • Bump winit to 0.30.0
  • Partially done the glow integration
  • Roughly implemented accesskit
  • Implemented winit / wgpu

Here is a summary of things that need to be done:

  • Integration with glow (have to wait until glutin-winit updates to winit 0.30.0)
  • Not all accesskit_winit::Event are being processed, temporarily I have marked them with todo!() (found in winit_integration.rs)
  • Move from deprecated winit::EventLoop::run_on_demand
  • Documentation and testing
  • Code review

@emilk emilk marked this pull request as draft May 6, 2024 14:27
@emilk emilk added eframe Relates to epi and eframe egui-winit porblems related to winit labels May 6, 2024
@Babakinha
Copy link

Hey, looks like we are no longer blocked by rust-windowing/glutin#1675 bcs rust-windowing/glutin#1678 got merged :3

@AndriBaal AndriBaal reopened this Jun 10, 2024
@AndriBaal
Copy link
Author

AndriBaal commented Jun 10, 2024

Thanks for the reminder. I managed to get the hello world example running on x11 with glutin.

Quick summary of my changes:

  • Updated and implemented accesskit like mentioned here
  • Updated glutin and glutin-winit to newest version
  • Removed rwh5 since glutin now support rhw6
  • Fixed compiling issues on x11

TODO:

  • Move from deprecated event_loop.run_on_demand and event_loop.run
  • Test accesskit (I have only copied from the mentioned comment and not tested it in depth by myself)
  • Test on different plattforms (I only tested it on x11)
  • Fix egui_glow pure_glowexample

@AndriBaal AndriBaal marked this pull request as ready for review June 10, 2024 16:38
@DataTriny
Copy link
Contributor

DataTriny commented Jun 10, 2024

I have tested the AccessKit integration on Windows and Linux/X11 and it seem to be fine. However I got the following warnings:

warning: use of deprecated method `winit::platform::run_on_demand::EventLoopExtRunOnDemand::run_on_demand`: use EventLoopExtRunOnDemand::run_app_on_demand
  --> crates\eframe\src\native\run.rs:76:16
   |
76 |     event_loop.run_on_demand(|event, event_loop_window_target| {
   |                ^^^^^^^^^^^^^
   |
   = note: `#[warn(deprecated)]` on by default

warning: use of deprecated method `winit::platform::run_on_demand::EventLoopExtRunOnDemand::run_on_demand`: use EventLoopExtRunOnDemand::run_app_on_demand
   --> crates\eframe\src\native\run.rs:225:14
    |
225 |             .run_on_demand(|_, event_loop_window_target| {
    |              ^^^^^^^^^^^^^

warning: use of deprecated method `winit::event_loop::EventLoop::<T>::run`: use `EventLoop::run_app` instead
   --> crates\eframe\src\native\run.rs:244:16
    |
244 |     event_loop.run(move |event, event_loop_window_target| {
    |                ^^^

Compiling the hello_world example on macOS failed with these errors though:

error[E0432]: unresolved import `winit::platform::macos::WindowBuilderExtMacOS`
    --> crates/egui-winit/src/lib.rs:1712:13
     |
1712 |         use winit::platform::macos::WindowBuilderExtMacOS as _;
     |             ^^^^^^^^^^^^^^^^^^^^^^^^---------------------^^^^^
     |             |                       |
     |             |                       help: a similar name exists in the module: `WindowExtMacOS`
     |             no `WindowBuilderExtMacOS` in `platform::macos`

error[E0599]: no method named `with_title_hidden` found for struct `WindowAttributes` in the current scope
    --> crates/egui-winit/src/lib.rs:1714:14
     |
1713 |           window_attributes = window_attributes
     |  _____________________________-
1714 | |             .with_title_hidden(!_title_shown.unwrap_or(true))
     | |_____________-^^^^^^^^^^^^^^^^^
     |
    ::: /Users/Arnold/.cargo/registry/src/index.crates.io-6f17d22bba15001f/winit-0.30.0/src/platform/macos.rs:200:8
     |
200  |       fn with_title_hidden(self, title_hidden: bool) -> Self;
     |          ----------------- the method is available for `WindowAttributes` here
     |
     = help: items from traits can only be used if the trait is in scope
help: the following trait is implemented but not in scope; perhaps add a `use` for it:
     |
12   + use winit::platform::macos::WindowAttributesExtMacOS;
     |
help: there is a method with a similar name
     |
1714 |             .with_title(!_title_shown.unwrap_or(true))
     |              ~~~~~~~~~~

Hope this helps.

@AndriBaal
Copy link
Author

AndriBaal commented Jun 10, 2024

Yes, the warnings are expected as I mentioned here: Move from deprecated event_loop.run_on_demand and event_loop.run. These methods are deprecated due to the new app API by winit 0.30. I believe that major changes need to be made to the core of eframe to support the new winit app API and I don't know if I'm familiar enough with egui to do such a refactor.

Thanks for testing on macOS. I think I fixed the errors, fell free to pull and try again :)

@DataTriny
Copy link
Contributor

It now compiles on macOS. I've tested accessibility on this platform as well. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
eframe Relates to epi and eframe egui-winit porblems related to winit
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update to winit 0.30 Update accesskit_winit
4 participants