Merge pull request #658 from hecrj/update-winit-and-glutin

hecrj · web-flow · commit a42b3c699827 · 2020-12-15T03:27:42.000+01:00
Update `winit` and `glutin`
diff --git a/glutin/Cargo.toml b/glutin/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["gui"]
 debug = ["iced_winit/debug"]
 
 [dependencies]
-glutin = "0.25"
+glutin = "0.26"
 
 [dependencies.iced_native]
 version = "0.3"
diff --git a/winit/Cargo.toml b/winit/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["gui"]
 debug = ["iced_native/debug"]
 
 [dependencies]
-winit = "0.23"
+winit = "0.24"
 window_clipboard = "0.1"
 log = "0.4"
 thiserror = "1.0"
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
@@ -170,7 +170,9 @@ pub fn mouse_button(mouse_button: winit::event::MouseButton) -> mouse::Button {
         winit::event::MouseButton::Left => mouse::Button::Left,
         winit::event::MouseButton::Right => mouse::Button::Right,
         winit::event::MouseButton::Middle => mouse::Button::Middle,
-        winit::event::MouseButton::Other(other) => mouse::Button::Other(other),
+        winit::event::MouseButton::Other(other) => {
+            mouse::Button::Other(other as u8)
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,9 @@ pub fn mouse_button(mouse_button: winit::event::MouseButton) -> mouse::Button {`
`170`	`170`	`winit::event::MouseButton::Left => mouse::Button::Left,`
`171`	`171`	`winit::event::MouseButton::Right => mouse::Button::Right,`
`172`	`172`	`winit::event::MouseButton::Middle => mouse::Button::Middle,`
`173`		`- winit::event::MouseButton::Other(other) => mouse::Button::Other(other),`
	`173`	`+ winit::event::MouseButton::Other(other) => {`
	`174`	`+ mouse::Button::Other(other as u8)`
	`175`	`+ }`
`174`	`176`	`}`
`175`	`177`	`}`
`176`	`178`