update winit to 0.30.3 #4702

j-axa · 2024-06-24T22:37:55Z

I liked the new way winit 0.30 handles the eventloop/window creation.

I updated the cargo.toml of relevant crates and fixed the errors that popped up.

It works for my usecase and the demo app seems to work but I can't verify further than that.

emilk · 2024-06-25T06:06:18Z

Closes Update to winit 0.30 #4437
Closes Update accesskit_winit #4219
Alternative to Bump winit to 0.30.0 and accesskit to 0.14.0 #4466

emilk · 2024-07-08T11:11:06Z

crates/eframe/Cargo.toml

+#rwh_06 = { package = "raw-window-handle", version = "0.6.2", optional = true, features = [
+#  "std",
+#] }


rm dead code

emilk · 2024-07-08T11:13:03Z

crates/egui_glow/Cargo.toml

+#rwh_06 = { package = "raw-window-handle", version = "0.6.2", features = [
+#  "std",
+#] }


rm dead code

emilk · 2024-07-08T11:13:09Z

crates/egui_glow/Cargo.toml


 [[example]]
 name = "pure_glow"
 required-features = [
  "winit",
  "egui/default_fonts",
-  "winit/rwh_05",       # glutin stuck on old version of raw-window-handle
+  "winit/rwh_06",       # glutin stuck on old version of raw-window-handle


Suggested change

"winit/rwh_06", # glutin stuck on old version of raw-window-handle

"winit/rwh_06",

emilk · 2024-07-08T11:13:21Z

crates/egui_glow/Cargo.toml

@@ -56,6 +56,7 @@ x11 = ["winit?/x11"]
 egui = { workspace = true, default-features = false, features = ["bytemuck"] }
 egui-winit = { workspace = true, optional = true, default-features = false }

+raw-window-handle.workspace = true


please keep dependencies sorted

emilk · 2024-07-08T11:14:13Z

crates/egui-winit/src/lib.rs

+        WindowEvent::PinchGesture { .. } => "WindowEvent::TouchpadMagnify",
        WindowEvent::RedrawRequested { .. } => "WindowEvent::RedrawRequested",
-        WindowEvent::SmartMagnify { .. } => "WindowEvent::SmartMagnify",
-        WindowEvent::TouchpadRotate { .. } => "WindowEvent::TouchpadRotate",
+        WindowEvent::DoubleTapGesture { .. } => "WindowEvent::SmartMagnify",
+        WindowEvent::RotationGesture { .. } => "WindowEvent::TouchpadRotate",


this maps to the old names

emilk · 2024-07-08T11:14:43Z

crates/egui-winit/src/lib.rs

+        create_winit_window_attributes(egui_ctx, event_loop, viewport_builder.clone());
+    let window = event_loop
+        .create_window(window_attributes)
+        .expect("failed to create window");


Return an error instead

emilk · 2024-07-08T11:15:43Z

crates/eframe/src/native/winit_integration.rs

+    AccessKitActionRequest(accesskit_winit::Event),
+}
+
+impl Default for UserEvent {


Why do we need to implement Default? And why is the default RequestRepaint?

emilk · 2024-07-08T11:16:18Z

crates/eframe/src/native/glow_integration.rs

+                    .build(
+                        window
+                            .window_handle()
+                            .expect("failed to get window handle")


We don't want crashes. Return errors instead. Here and everywhere.
Add a case to eframe::Error if needed

emilk · 2024-07-08T11:16:42Z

crates/eframe/src/native/glow_integration.rs

-            use rwh_05::HasRawWindowHandle as _; // glutin stuck on old version of raw-window-handle
-            w.raw_window_handle()
+            w.window_handle()
+                .expect("failed to get window handle")


Return errors

emilk · 2024-07-08T11:19:58Z

Please don't open PRs from your master branch. Read the PR template for why.

* Closes #1918 * Closes #4437 * Closes #4709 * [x] I have followed the instructions in the PR template Hiya, 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](rust-windowing/winit#3800), 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 * [x] macOS * [x] Windows * [x] Wayland (thanks [SiebenCorgie](https://github.com/SiebenCorgie)) * [x] X11 (thanks [crumblingstatue](https://github.com/crumblingstatue)!, [SiebenCorgie](https://github.com/SiebenCorgie)) # TODO * [x] Fix "follow system theme" not working on initial startup (winit issue, pinning to 0.30.2 for now). * [x] Fix `request_repaint_after` --------- Co-authored-by: mwcampbell <[email protected]> Co-authored-by: j-axa <[email protected]> Co-authored-by: DataTriny <[email protected]> Co-authored-by: Emil Ernerfeldt <[email protected]>

emilk · 2024-07-31T07:43:35Z

Closed by Upgrade winit to 0.30.2 #4849

* Closes emilk#1918 * Closes emilk#4437 * Closes emilk#4709 * [x] I have followed the instructions in the PR template Hiya, 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: emilk#4466 Seems to have gone stale & is missing some bits. emilk#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](rust-windowing/winit#3800), 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! * [x] macOS * [x] Windows * [x] Wayland (thanks [SiebenCorgie](https://github.com/SiebenCorgie)) * [x] X11 (thanks [crumblingstatue](https://github.com/crumblingstatue)!, [SiebenCorgie](https://github.com/SiebenCorgie)) * [x] Fix "follow system theme" not working on initial startup (winit issue, pinning to 0.30.2 for now). * [x] Fix `request_repaint_after` --------- Co-authored-by: mwcampbell <[email protected]> Co-authored-by: j-axa <[email protected]> Co-authored-by: DataTriny <[email protected]> Co-authored-by: Emil Ernerfeldt <[email protected]>

* Closes emilk#1918 * Closes emilk#4437 * Closes emilk#4709 * [x] I have followed the instructions in the PR template Hiya, 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: emilk#4466 Seems to have gone stale & is missing some bits. emilk#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](rust-windowing/winit#3800), 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 * [x] macOS * [x] Windows * [x] Wayland (thanks [SiebenCorgie](https://github.com/SiebenCorgie)) * [x] X11 (thanks [crumblingstatue](https://github.com/crumblingstatue)!, [SiebenCorgie](https://github.com/SiebenCorgie)) # TODO * [x] Fix "follow system theme" not working on initial startup (winit issue, pinning to 0.30.2 for now). * [x] Fix `request_repaint_after` --------- Co-authored-by: mwcampbell <[email protected]> Co-authored-by: j-axa <[email protected]> Co-authored-by: DataTriny <[email protected]> Co-authored-by: Emil Ernerfeldt <[email protected]>

j-axa added 2 commits June 25, 2024 00:21

update winit to 0.30.3

2bf1f02

cleanup

c283ce6

j-axa added 3 commits June 29, 2024 02:52

fix errors in egui_glow caused by updating to winit 0.30

f6e5d00

merge

80f1b93

togglebutton was removed from accesskit

4b76e82

DataTriny mentioned this pull request Jun 29, 2024

AccessKit can result in a thread sleep deadlock lukexor/tetanes#309

Open

j-axa added 2 commits June 30, 2024 00:53

windowbuilder -> windowattributes on linux, macos

c1f1746

rename window_builder to window_attributes

eb873d5

emilk reviewed Jul 8, 2024

View reviewed changes

emilk marked this pull request as draft July 8, 2024 11:20

torokati44 mentioned this pull request Jul 8, 2024

build(deps): bump winit from 0.29.15 to 0.30.3 in the winit-wgpu-egui group across 1 directory ruffle-rs/ruffle#16835

Closed

emilk mentioned this pull request Jul 15, 2024

Update to winit 0.30 #4437

Closed

ArthurBrussee mentioned this pull request Jul 18, 2024

Upgrade winit to 0.30.2 #4849

Merged

7 tasks

emilk closed this Jul 31, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update winit to 0.30.3 #4702

update winit to 0.30.3 #4702

j-axa commented Jun 24, 2024

emilk commented Jun 25, 2024 •

edited

Loading

emilk Jul 8, 2024

emilk Jul 8, 2024

emilk Jul 8, 2024

emilk Jul 8, 2024

emilk Jul 8, 2024

emilk Jul 8, 2024

emilk Jul 8, 2024

emilk Jul 8, 2024

emilk Jul 8, 2024

emilk commented Jul 8, 2024

emilk commented Jul 31, 2024 •

edited

Loading

	"winit/rwh_06", # glutin stuck on old version of raw-window-handle
	"winit/rwh_06",

update winit to 0.30.3 #4702

update winit to 0.30.3 #4702

Conversation

j-axa commented Jun 24, 2024

emilk commented Jun 25, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

emilk commented Jul 8, 2024

emilk commented Jul 31, 2024 • edited Loading

emilk commented Jun 25, 2024 •

edited

Loading

emilk commented Jul 31, 2024 •

edited

Loading