reivilibre
/
iced-mobile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use `winit` and `glutin` forks in `iced-rs` org

This commit is contained in:
Richard 2021-06-14 17:21:55 -03:00 committed by Héctor Ramón Jiménez
parent 96a462d2f2
commit 612585109f
No known key found for this signature in database
GPG Key ID: 44B88EB52AB1EE8D
5 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -92,9 +92,6 @@ iced_core = { version = "0.4", path = "core" }
iced_futures = { version = "0.3", path = "futures" } iced_futures = { version = "0.3", path = "futures" }
thiserror = "1.0" thiserror = "1.0"
[patch.crates-io]
winit = { git="https://github.com/iced-rs/winit", rev="152eda9b2d995dd0f5b886a53bddac7c75738b47" }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies] [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
iced_winit = { version = "0.3", path = "winit" } iced_winit = { version = "0.3", path = "winit" }
iced_glutin = { version = "0.2", path = "glutin", optional = true } iced_glutin = { version = "0.2", path = "glutin", optional = true }

6
glutin/Cargo.toml
View File

@ -13,8 +13,10 @@ categories = ["gui"]
[features] [features]
debug = ["iced_winit/debug"] debug = ["iced_winit/debug"]
[dependencies] [dependencies.glutin]
glutin = "0.27" version = "0.27"
git = "https://github.com/iced-rs/glutin"
rev = "be6793b5b3defc9452cd1c896cd315ed7442d546"
[dependencies.iced_native] [dependencies.iced_native]
version = "0.4" version = "0.4"

10
glutin/src/application.rs
View File

@ -237,9 +237,15 @@ async fn run_instance<A, E, C>(
context.window().request_redraw(); context.window().request_redraw();
} }
event::Event::PlatformSpecific(event::PlatformSpecific::MacOS(event::MacOS::ReceivedUrl(url))) => { event::Event::PlatformSpecific(event::PlatformSpecific::MacOS(
event::MacOS::ReceivedUrl(url),
)) => {
use iced_native::event; use iced_native::event;
events.push(iced_native::Event::PlatformSpecific(event::PlatformSpecific::MacOS(event::MacOS::ReceivedUrl(url)))); events.push(iced_native::Event::PlatformSpecific(
event::PlatformSpecific::MacOS(event::MacOS::ReceivedUrl(
url,
)),
));
} }
event::Event::UserEvent(message) => { event::Event::UserEvent(message) => {
messages.push(message); messages.push(message);

6
winit/Cargo.toml
View File

@ -14,11 +14,15 @@ categories = ["gui"]
debug = ["iced_native/debug"] debug = ["iced_native/debug"]
[dependencies] [dependencies]
winit = "0.25"
window_clipboard = "0.2" window_clipboard = "0.2"
log = "0.4" log = "0.4"
thiserror = "1.0" thiserror = "1.0"
[dependencies.winit]
version = "0.25"
git = "https://github.com/iced-rs/winit"
rev = "9c358959ed99736566d50a511b03d2fed3aac2ae"
[dependencies.iced_native] [dependencies.iced_native]
version = "0.4" version = "0.4"
path = "../native" path = "../native"

10
winit/src/application.rs
View File

@ -310,9 +310,15 @@ async fn run_instance<A, E, C>(
window.request_redraw(); window.request_redraw();
} }
event::Event::PlatformSpecific(event::PlatformSpecific::MacOS(event::MacOS::ReceivedUrl(url))) => { event::Event::PlatformSpecific(event::PlatformSpecific::MacOS(
event::MacOS::ReceivedUrl(url),
)) => {
use iced_native::event; use iced_native::event;
events.push(iced_native::Event::PlatformSpecific(event::PlatformSpecific::MacOS(event::MacOS::ReceivedUrl(url)))); events.push(iced_native::Event::PlatformSpecific(
event::PlatformSpecific::MacOS(event::MacOS::ReceivedUrl(
url,
)),
));
} }
event::Event::UserEvent(message) => { event::Event::UserEvent(message) => {
messages.push(message); messages.push(message);