Fix winit breaking changes; default to x11, add wayland feature.

nannou-org · Oct 12, 2023 · 8726b22 · 8726b22
1 parent 1648fd4
commit 8726b22
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/nannou/src/window.rs b/nannou/src/window.rs
@@ -779,11 +779,26 @@ impl<'app> Builder<'app> {
             target_os = "netbsd",
             target_os = "openbsd"
         ))]
+        #[cfg(not(feature = "wayland"))]
         {
-            use winit::platform::unix::WindowBuilderExtUnix;
+            use winit::platform::x11::WindowBuilderExtUnix;
             window = window.with_class("nannou".to_string(), "nannou".to_string());
         }
 
+        #[cfg(any(
+            target_os = "linux",
+            target_os = "dragonfly",
+            target_os = "freebsd",
+            target_os = "netbsd",
+            target_os = "openbsd"
+        ))]
+        #[cfg(feature = "wayland")]
+        {
+            use winit::platform::x11::WindowBuilderExtUnix;
+            window = window.with_class("nannou".to_string(), "nannou".to_string());
+        }
+
+
         // Set default dimensions in the case that none were given.
         let initial_window_size = window
             .window_attributes()

diff --git a/nannou_egui/Cargo.toml b/nannou_egui/Cargo.toml
@@ -17,3 +17,6 @@ egui = "0.23"
 eframe = "0.23"
 winit = "0.28"
 nannou = { version = "0.18.1", path = "../nannou" }
+
+[features]
+wayland = []