From 2973b9aaead49aec05f74b45d9de3ee27fcf42d3 Mon Sep 17 00:00:00 2001 From: tasgon Date: Tue, 2 Apr 2024 12:18:29 -0700 Subject: [PATCH] Revert "use iced fork with disabled text_input widget cache" This reverts commit b8ef0fb793993ab9414152f5c53c61fd2902a366. --- Cargo.lock | 45 +++++++++++++++++++++++++++------------------ Cargo.toml | 16 +++++----------- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dbaccf9..79c04ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2268,8 +2268,9 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] name = "iced_core" -version = "0.12.1" -source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55f9226618af7e8155fc8a233e4d84dc1ec44438705f972e35d5d50e62f937df" dependencies = [ "bitflags 2.4.1", "glam", @@ -2285,8 +2286,9 @@ dependencies = [ [[package]] name = "iced_futures" -version = "0.12.1" -source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "370bad88fb3832cbeeb3fa6c486b4701fb7e8da32a753b3101d4ce81fc1d9497" dependencies = [ "futures", "iced_core", @@ -2297,8 +2299,9 @@ dependencies = [ [[package]] name = "iced_graphics" -version = "0.12.1" -source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0660df444c64a13f72999c55a324f6d3ea020167bb1af8ef43fe2bff168d8c27" dependencies = [ "bitflags 2.4.1", "bytemuck", @@ -2317,8 +2320,9 @@ dependencies = [ [[package]] name = "iced_renderer" -version = "0.12.1" -source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59d931249515deb5fe116c7d199792cd9fd32d31bf18ffc08c6c2ad2dee5fd3e" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2329,8 +2333,9 @@ dependencies = [ [[package]] name = "iced_runtime" -version = "0.12.1" -source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "618a845cd752ca195f0805b7a4f0be42c071a4fdef0b88df047006572d219a5a" dependencies = [ "iced_core", "iced_futures", @@ -2340,8 +2345,9 @@ dependencies = [ [[package]] name = "iced_style" -version = "0.12.1" -source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb6b3992bceeac1393ce0e83d06ab786be4c17c6a0004eefbdd4f6d89d5e8058" dependencies = [ "iced_core", "once_cell", @@ -2350,8 +2356,9 @@ dependencies = [ [[package]] name = "iced_tiny_skia" -version = "0.12.1" -source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e079a4ae34df06894500e486b20bae8d8f2806fd64efe4fa9abe329e7f585f21" dependencies = [ "bytemuck", "cosmic-text", @@ -2366,8 +2373,9 @@ dependencies = [ [[package]] name = "iced_wgpu" -version = "0.12.1" -source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa5d3ce370c7044ddc9535c8f87057f1008434a495be6b9f46b2666c3e9638f7" dependencies = [ "bitflags 2.4.1", "bytemuck", @@ -2383,8 +2391,9 @@ dependencies = [ [[package]] name = "iced_widget" -version = "0.12.1" -source = "git+https://github.com/tzemanovic/iced.git?rev=ac826cf5f72a0598bbe986fd6da9f970ef91ab98#ac826cf5f72a0598bbe986fd6da9f970ef91ab98" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99f30ebbcc0706c19a92f01669193271d82bb209fda83576392d04cef3214ca2" dependencies = [ "iced_renderer", "iced_runtime", diff --git a/Cargo.toml b/Cargo.toml index db7963a..30b9fc8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,17 +22,11 @@ bevy_render = "0.13" bevy_utils = "0.13" bevy_window = "0.13" -# iced_core = "0.12" -# iced_runtime = "0.12" -# iced_wgpu = "0.12" -# iced_widget = "0.12" -# iced_renderer = { version = "0.12", features = ["wgpu"] } -# NOTE: temp fork for https://github.com/iced-rs/iced/issues/2318 -iced_core = { git = "https://github.com/tzemanovic/iced.git", rev = "ac826cf5f72a0598bbe986fd6da9f970ef91ab98" } -iced_runtime = { git = "https://github.com/tzemanovic/iced.git", rev = "ac826cf5f72a0598bbe986fd6da9f970ef91ab98" } -iced_wgpu = { git = "https://github.com/tzemanovic/iced.git", rev = "ac826cf5f72a0598bbe986fd6da9f970ef91ab98" } -iced_widget = { git = "https://github.com/tzemanovic/iced.git", rev = "ac826cf5f72a0598bbe986fd6da9f970ef91ab98" } -iced_renderer = { git = "https://github.com/tzemanovic/iced.git", rev = "ac826cf5f72a0598bbe986fd6da9f970ef91ab98" , features = ["wgpu"] } +iced_core = "0.12" +iced_runtime = "0.12" +iced_wgpu = "0.12" +iced_widget = "0.12" +iced_renderer = { version = "0.12", features = ["wgpu"] } [dev-dependencies] bevy = "0.13"