Update winit to latest commit used by upstream iced

pop-os · Oct 19, 2023 · c716df2 · c716df2
1 parent 1e45d23
commit c716df2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 Many thanks to...
+- @jackpot51
 - @wash2
 
 ## [0.10.0] - 2023-07-28

diff --git a/winit/Cargo.toml b/winit/Cargo.toml
@@ -31,7 +31,7 @@ raw-window-handle = "0.5"
 
 [dependencies.winit]
 git = "https://github.com/pop-os/winit.git"
-branch = "iced"
+branch = "master"
 
 [dependencies.iced_runtime]
 version = "0.1"

diff --git a/winit/src/settings.rs b/winit/src/settings.rs
@@ -167,7 +167,7 @@ impl Window {
         {
             // `with_name` is available on both `WindowBuilderExtWayland` and `WindowBuilderExtX11` and they do
             // exactly the same thing. We arbitrarily choose `WindowBuilderExtWayland` here.
-            use ::winit::platform::unix::WindowBuilderExtUnix;
+            use ::winit::platform::wayland::WindowBuilderExtWayland;
 
             if let Some(id) = _id {
                 window_builder = window_builder.with_name(id.clone(), id);
@@ -202,7 +202,9 @@ impl Window {
 
         #[cfg(target_os = "linux")]
         {
-            use winit::platform::unix::WindowBuilderExtUnix;
+            // `with_name` is available on both `WindowBuilderExtWayland` and `WindowBuilderExtX11` and they do
+            // exactly the same thing. We arbitrarily choose `WindowBuilderExtWayland` here.
+            use winit::platform::wayland::WindowBuilderExtWayland;
 
             window_builder = window_builder.with_name(
                 &self.platform_specific.application_id,