leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor: disable wayland in winit shell by default

Browse source
This commit is contained in:
Ashley Wulber 2024-10-21 10:44:40 -04:00
parent 16f14793c7
commit dcdc6c1410
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
winit/Cargo.toml
View file

@ -14,14 +14,6 @@ keywords.workspace = true
workspace = true workspace = true
[features] [features]
default = ["x11", "wayland", "wayland-dlopen"]
debug = ["iced_debug/enable"]
sysinfo = ["dep:sysinfo"]
unconditional-rendering = []
linux-theme-detection = ["dep:mundy", "mundy/async-io", "mundy/color-scheme"]
x11 = ["winit/x11"]
system = ["sysinfo"]
program = []
wayland = [ wayland = [
"winit/wayland", "winit/wayland",
"sctk", "sctk",
@ -34,6 +26,14 @@ wayland = [
"xkeysym", "xkeysym",
"wayland-csd-adwaita", "wayland-csd-adwaita",
] ]
default = ["x11", "wayland-dlopen"]
debug = ["iced_debug/enable"]
sysinfo = ["dep:sysinfo"]
unconditional-rendering = []
linux-theme-detection = ["dep:mundy", "mundy/async-io", "mundy/color-scheme"]
x11 = ["winit/x11"]
system = ["sysinfo"]
program = []
wayland-dlopen = ["winit/wayland-dlopen"] wayland-dlopen = ["winit/wayland-dlopen"]
wayland-csd-adwaita = ["winit/wayland-csd-adwaita"] wayland-csd-adwaita = ["winit/wayland-csd-adwaita"]
multi-window = ["iced_runtime/multi-window"] multi-window = ["iced_runtime/multi-window"]

4
winit/src/platform_specific/mod.rs
View file

@ -66,7 +66,7 @@ impl PlatformSpecific {
) { ) {
match action { match action {
#[cfg(all(feature = "wayland", target_os = "linux"))] #[cfg(all(feature = "wayland", target_os = "linux"))]
platform_specific::Action::Wayland(a) => { iced_runtime::platform_specific::Action::Wayland(a) => {
self.send_wayland(wayland::Action::Action(a)); self.send_wayland(wayland::Action::Action(a));
} }
} }
@ -106,7 +106,7 @@ impl PlatformSpecific {
wayland_display_handle.display.as_ptr().cast(), wayland_display_handle.display.as_ptr().cast(),
) )
}; };
Connection::from_backend(backend) sctk::reexports::client::Connection::from_backend(backend)
} }
_ => { _ => {
return; return;