alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2025-01-11 13:31:29 +11:00
Code Issues Packages Projects Releases Wiki Activity

Improve feature names to enable web backends

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2019-07-01 20:43:54 +02:00
parent e89674d337
commit 5cc84f32db
4 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Cargo.toml
View file

@ -14,8 +14,8 @@ categories = ["gui"]
features = ["serde"] features = ["serde"]
[features] [features]
use_web-sys = ["web-sys", "wasm-bindgen", "instant/wasm-bindgen"] web-sys = ["web_sys", "wasm-bindgen", "instant/wasm-bindgen"]
use_stdweb = ["stdweb", "instant/stdweb"] stdweb = ["std_web", "instant/stdweb"]
[dependencies] [dependencies]
instant = "0.1" instant = "0.1"
@ -78,7 +78,8 @@ percent-encoding = "1.0"
[target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "windows"))'.dependencies.parking_lot] [target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "windows"))'.dependencies.parking_lot]
version = "0.8" version = "0.8"
[target.'cfg(target_arch = "wasm32")'.dependencies.web-sys] [target.'cfg(target_arch = "wasm32")'.dependencies.web_sys]
package = "web-sys"
version = "0.3.22" version = "0.3.22"
optional = true optional = true
features = [ features = [
@ -103,7 +104,8 @@ features = [
version = "0.2.45" version = "0.2.45"
optional = true optional = true
[target.'cfg(target_arch = "wasm32")'.dependencies.stdweb] [target.'cfg(target_arch = "wasm32")'.dependencies.std_web]
package = "stdweb"
version = "0.4.17" version = "0.4.17"
optional = true optional = true

4
src/lib.rs
View file

@ -135,9 +135,9 @@ extern crate smithay_client_toolkit as sctk;
target_os = "openbsd" target_os = "openbsd"
))] ))]
extern crate x11_dl; extern crate x11_dl;
#[cfg(feature = "stdweb")] #[cfg(feature = "std_web")]
#[macro_use] #[macro_use]
extern crate stdweb; extern crate std_web as stdweb;
#[cfg(any( #[cfg(any(
target_os = "linux", target_os = "linux",
target_os = "dragonfly", target_os = "dragonfly",

8
src/platform/web.rs
View file

@ -1,15 +1,15 @@
#[cfg(feature = "use_stdweb")] #[cfg(feature = "stdweb")]
use stdweb::web::html_element::CanvasElement; use stdweb::web::html_element::CanvasElement;
#[cfg(feature = "use_stdweb")] #[cfg(feature = "stdweb")]
pub trait WindowExtStdweb { pub trait WindowExtStdweb {
fn canvas(&self) -> CanvasElement; fn canvas(&self) -> CanvasElement;
} }
#[cfg(feature = "use_web-sys")] #[cfg(feature = "web-sys")]
use web_sys::HtmlCanvasElement; use web_sys::HtmlCanvasElement;
#[cfg(feature = "use_web-sys")] #[cfg(feature = "web-sys")]
pub trait WindowExtWebSys { pub trait WindowExtWebSys {
fn canvas(&self) -> HtmlCanvasElement; fn canvas(&self) -> HtmlCanvasElement;
} }

4
src/platform_impl/web/mod.rs
View file

@ -11,11 +11,11 @@ mod event_loop;
mod monitor; mod monitor;
mod window; mod window;
#[cfg(feature = "use_web-sys")] #[cfg(feature = "web-sys")]
#[path = "web_sys/mod.rs"] #[path = "web_sys/mod.rs"]
mod backend; mod backend;
#[cfg(feature = "use_stdweb")] #[cfg(feature = "stdweb")]
#[path = "stdweb/mod.rs"] #[path = "stdweb/mod.rs"]
mod backend; mod backend;