alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-24 22:31:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Bump the stdweb version to 0.4.18 (#1049)

Browse source 
This removes the need to patch to a git version
This commit is contained in:
Ryan G 2019-07-16 20:56:58 -07:00 committed by Hal Gentz
parent fe12996382
commit e897d70733
4 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Cargo.toml
View file

@ -113,8 +113,5 @@ optional = true
[target.'cfg(target_arch = "wasm32")'.dependencies.std_web] [target.'cfg(target_arch = "wasm32")'.dependencies.std_web]
package = "stdweb" package = "stdweb"
version = "0.4.17" version = "0.4.18"
optional = true optional = true
[patch.crates-io]
stdweb = { git = "https://github.com/koute/stdweb", rev = "b3a29bb9dd9b9405540d711ed02a21cd7058d5c0"}

1
src/lib.rs
View file

@ -130,7 +130,6 @@ extern crate bitflags;
#[macro_use] #[macro_use]
extern crate objc; extern crate objc;
#[cfg(feature = "std_web")] #[cfg(feature = "std_web")]
#[macro_use]
extern crate std_web as stdweb; extern crate std_web as stdweb;
pub mod dpi; pub mod dpi;

2
src/platform_impl/web/stdweb/event.rs
View file

@ -2,7 +2,7 @@ use crate::dpi::LogicalPosition;
use crate::event::{ModifiersState, MouseButton, MouseScrollDelta, ScanCode, VirtualKeyCode}; use crate::event::{ModifiersState, MouseButton, MouseScrollDelta, ScanCode, VirtualKeyCode};
use stdweb::web::event::{IKeyboardEvent, IMouseEvent, MouseWheelDeltaMode, MouseWheelEvent}; use stdweb::web::event::{IKeyboardEvent, IMouseEvent, MouseWheelDeltaMode, MouseWheelEvent};
use stdweb::{unstable::TryInto, JsSerialize}; use stdweb::{js, unstable::TryInto, JsSerialize};
pub fn mouse_button(event: &impl IMouseEvent) -> MouseButton { pub fn mouse_button(event: &impl IMouseEvent) -> MouseButton {
match event.button() { match event.button() {

1
src/platform_impl/web/stdweb/mod.rs
View file

@ -8,6 +8,7 @@ pub use self::timeout::Timeout;
use crate::platform::web::WindowExtStdweb; use crate::platform::web::WindowExtStdweb;
use crate::window::Window; use crate::window::Window;
use stdweb::js;
use stdweb::web::html_element::CanvasElement; use stdweb::web::html_element::CanvasElement;
pub fn throw(msg: &str) { pub fn throw(msg: &str) {