From 55cd1dc916794e9b7e9f4df653646fd42408c08c Mon Sep 17 00:00:00 2001 From: edwloef Date: Wed, 18 Sep 2024 13:05:38 +0200 Subject: [PATCH] bump iced to v0.13.0 --- Cargo.lock | 193 ++++++++++++++++------------------------------- Cargo.toml | 8 +- examples/menu.rs | 8 +- 3 files changed, 71 insertions(+), 138 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 363e30df..f8e5e898 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -396,20 +396,6 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fca2be1d5c43812bae364ee3f30b3afcb7877cf59f4aeb94c66f313a41d2fac9" -[[package]] -name = "calloop" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" -dependencies = [ - "bitflags 2.6.0", - "log", - "polling", - "rustix", - "slab", - "thiserror", -] - [[package]] name = "calloop" version = "0.13.0" @@ -424,25 +410,13 @@ dependencies = [ "thiserror", ] -[[package]] -name = "calloop-wayland-source" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" -dependencies = [ - "calloop 0.12.4", - "rustix", - "wayland-backend", - "wayland-client", -] - [[package]] name = "calloop-wayland-source" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20" dependencies = [ - "calloop 0.13.0", + "calloop", "rustix", "wayland-backend", "wayland-client", @@ -837,7 +811,8 @@ checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" [[package]] name = "dpi" version = "0.1.1" -source = "git+https://github.com/iced-rs/winit.git?rev=254d6b3420ce4e674f516f7a2bd440665e05484d#254d6b3420ce4e674f516f7a2bd440665e05484d" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" [[package]] name = "drm" @@ -1241,18 +1216,6 @@ dependencies = [ "gl_generator", ] -[[package]] -name = "glyphon" -version = "0.5.0" -source = "git+https://github.com/hecrj/glyphon.git?rev=feef9f5630c2adb3528937e55f7bfad2da561a65#feef9f5630c2adb3528937e55f7bfad2da561a65" -dependencies = [ - "cosmic-text", - "etagere", - "lru", - "rustc-hash 2.0.0", - "wgpu", -] - [[package]] name = "gpu-alloc" version = "0.6.0" @@ -1408,8 +1371,9 @@ dependencies = [ [[package]] name = "iced" -version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced.git#9426418adbaac40f584fe16b623521a3a21a1a4c" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44ccdb0d1a25ff7581e75991229857c353c87d79c199d375af37d264f6fbd06d" dependencies = [ "iced_core", "iced_futures", @@ -1437,8 +1401,9 @@ dependencies = [ [[package]] name = "iced_core" -version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced.git#9426418adbaac40f584fe16b623521a3a21a1a4c" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce264c157ad3968928d93f9b244ad8ad63465b5a5c31c86c13199b333629f16f" dependencies = [ "bitflags 2.6.0", "bytes", @@ -1456,8 +1421,9 @@ dependencies = [ [[package]] name = "iced_futures" -version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced.git#9426418adbaac40f584fe16b623521a3a21a1a4c" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b47bd5c48706c57004c8a2d4cb127cb4535600843edb13aed10b09c7cd55eda4" dependencies = [ "futures", "iced_core", @@ -1467,10 +1433,24 @@ dependencies = [ "wasm-timer", ] +[[package]] +name = "iced_glyphon" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41c3bb56f1820ca252bc1d0994ece33d233a55657c0c263ea7cb16895adbde82" +dependencies = [ + "cosmic-text", + "etagere", + "lru", + "rustc-hash 2.0.0", + "wgpu", +] + [[package]] name = "iced_graphics" -version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced.git#9426418adbaac40f584fe16b623521a3a21a1a4c" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba25a18cfa6d5cc160aca7e1b34f73ccdff21680fa8702168c09739767b6c66f" dependencies = [ "bitflags 2.6.0", "bytemuck", @@ -1489,8 +1469,9 @@ dependencies = [ [[package]] name = "iced_renderer" -version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced.git#9426418adbaac40f584fe16b623521a3a21a1a4c" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73558208059f9e622df2bf434e044ee2f838ce75201a023cf0ca3e1244f46c2a" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -1501,8 +1482,9 @@ dependencies = [ [[package]] name = "iced_runtime" -version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced.git#9426418adbaac40f584fe16b623521a3a21a1a4c" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f72474ab379b1c53f4ec5e468c66f8e307f8db13c865c2714d2c4a4a5b38c9a1" dependencies = [ "bytes", "iced_core", @@ -1513,8 +1495,9 @@ dependencies = [ [[package]] name = "iced_tiny_skia" -version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced.git#9426418adbaac40f584fe16b623521a3a21a1a4c" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c625d368284fcc43b0b36b176f76eff1abebe7959dd58bd8ce6897d641962a50" dependencies = [ "bytemuck", "cosmic-text", @@ -1528,15 +1511,16 @@ dependencies = [ [[package]] name = "iced_wgpu" -version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced.git#9426418adbaac40f584fe16b623521a3a21a1a4c" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8194d7666004b8e947f89ab7446d323ab0b882971226c1913ef98764c9e4bbc4" dependencies = [ "bitflags 2.6.0", "bytemuck", "futures", "glam", - "glyphon", "guillotiere", + "iced_glyphon", "iced_graphics", "log", "lyon", @@ -1548,8 +1532,9 @@ dependencies = [ [[package]] name = "iced_widget" -version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced.git#9426418adbaac40f584fe16b623521a3a21a1a4c" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e88dd57d414cc44427c523534b80e52a42b6828f0e27ad7b8478f839865ee3c" dependencies = [ "iced_renderer", "iced_runtime", @@ -1562,8 +1547,9 @@ dependencies = [ [[package]] name = "iced_winit" -version = "0.13.0-dev" -source = "git+https://github.com/iced-rs/iced.git#9426418adbaac40f584fe16b623521a3a21a1a4c" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f44cd4e1c594b6334f409282937bf972ba14d31fedf03c23aa595d982a2fda28" dependencies = [ "iced_futures", "iced_graphics", @@ -2776,14 +2762,14 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7555fcb4f753d095d734fdefebb0ad8c98478a21db500492d87c55913d3b0086" +checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec" dependencies = [ "ab_glyph", "log", "memmap2", - "smithay-client-toolkit 0.18.1", + "smithay-client-toolkit", "tiny-skia", ] @@ -2890,31 +2876,6 @@ version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" -[[package]] -name = "smithay-client-toolkit" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" -dependencies = [ - "bitflags 2.6.0", - "calloop 0.12.4", - "calloop-wayland-source 0.2.0", - "cursor-icon", - "libc", - "log", - "memmap2", - "rustix", - "thiserror", - "wayland-backend", - "wayland-client", - "wayland-csd-frame", - "wayland-cursor", - "wayland-protocols 0.31.2", - "wayland-protocols-wlr 0.2.0", - "wayland-scanner", - "xkeysym", -] - [[package]] name = "smithay-client-toolkit" version = "0.19.2" @@ -2922,8 +2883,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3457dea1f0eb631b4034d61d4d8c32074caa6cd1ab2d59f2327bd8461e2c0016" dependencies = [ "bitflags 2.6.0", - "calloop 0.13.0", - "calloop-wayland-source 0.3.0", + "calloop", + "calloop-wayland-source", "cursor-icon", "libc", "log", @@ -2934,8 +2895,8 @@ dependencies = [ "wayland-client", "wayland-csd-frame", "wayland-cursor", - "wayland-protocols 0.32.3", - "wayland-protocols-wlr 0.3.3", + "wayland-protocols", + "wayland-protocols-wlr", "wayland-scanner", "xkeysym", ] @@ -2947,7 +2908,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc8216eec463674a0e90f29e0ae41a4db573ec5b56b1c6c1c71615d249b6d846" dependencies = [ "libc", - "smithay-client-toolkit 0.19.2", + "smithay-client-toolkit", "wayland-backend", ] @@ -3473,18 +3434,6 @@ dependencies = [ "xcursor", ] -[[package]] -name = "wayland-protocols" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - [[package]] name = "wayland-protocols" version = "0.32.3" @@ -3499,27 +3448,14 @@ dependencies = [ [[package]] name = "wayland-protocols-plasma" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" -dependencies = [ - "bitflags 2.6.0", - "wayland-backend", - "wayland-client", - "wayland-protocols 0.31.2", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.2.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +checksum = "f79f2d57c7fcc6ab4d602adba364bf59a5c24de57bd194486bf9b8360e06bfc4" dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", + "wayland-protocols", "wayland-scanner", ] @@ -3532,7 +3468,7 @@ dependencies = [ "bitflags 2.6.0", "wayland-backend", "wayland-client", - "wayland-protocols 0.32.3", + "wayland-protocols", "wayland-scanner", ] @@ -3954,8 +3890,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winit" -version = "0.30.1" -source = "git+https://github.com/iced-rs/winit.git?rev=254d6b3420ce4e674f516f7a2bd440665e05484d#254d6b3420ce4e674f516f7a2bd440665e05484d" +version = "0.30.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0be9e76a1f1077e04a411f0b989cbd3c93339e1771cb41e71ac4aee95bfd2c67" dependencies = [ "ahash 0.8.11", "android-activity", @@ -3963,7 +3900,7 @@ dependencies = [ "bitflags 2.6.0", "block2", "bytemuck", - "calloop 0.12.4", + "calloop", "cfg_aliases 0.2.1", "concurrent-queue", "core-foundation", @@ -3985,7 +3922,7 @@ dependencies = [ "redox_syscall 0.4.1", "rustix", "sctk-adwaita", - "smithay-client-toolkit 0.18.1", + "smithay-client-toolkit", "smol_str", "tracing", "unicode-segmentation", @@ -3993,7 +3930,7 @@ dependencies = [ "wasm-bindgen-futures", "wayland-backend", "wayland-client", - "wayland-protocols 0.31.2", + "wayland-protocols", "wayland-protocols-plasma", "web-sys", "web-time", diff --git a/Cargo.toml b/Cargo.toml index d8a83da5..87d97e6b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -69,9 +69,9 @@ once_cell = { version = "1.19.0", optional = true } time = { version = "0.3.34", features = ["local-offset"], optional = true } [dependencies.iced] -git = "https://github.com/iced-rs/iced.git" +#git = "https://github.com/iced-rs/iced.git" #rev = "b474a2b7a763dcde6a377cb409001a7b5285ee8d" -version = "0.13.0-dev" +version = "0.13.0" default-features = false features = ["advanced"] @@ -83,9 +83,9 @@ num-traits = "0.2.16" # For widget_id_return example rand = "0.8" # For wrap example [dev-dependencies.iced] -git = "https://github.com/iced-rs/iced.git" +#git = "https://github.com/iced-rs/iced.git" #rev = "b474a2b7a763dcde6a377cb409001a7b5285ee8d" -version = "0.13.0-dev" +version = "0.13.0" #default-features = false features = ["advanced", "wgpu"] diff --git a/examples/menu.rs b/examples/menu.rs index 00686359..68b66393 100644 --- a/examples/menu.rs +++ b/examples/menu.rs @@ -209,10 +209,8 @@ impl App { ) (text_input("", &self.text).on_input(Message::TextChange)) (container(toggler( - Some("Or as a sub menu item".to_string()), self.toggle, - Message::ToggleChange, - )) + ).label("Or as a sub menu item".to_string()).on_toggle(Message::ToggleChange)) .padding([0, 8]) .height(30.0) .align_y(alignment::Vertical::Center), @@ -234,10 +232,8 @@ impl App { )).width(240.0)) (debug_button_s("Controls"), menu_tpl_1(menu_items!( (row![toggler( - Some("Dark Mode".into()), self.dark_mode, - Message::ThemeChange - )].padding([0, 8]) + ).label("Dark Mode".to_string()).on_toggle(Message::ThemeChange)].padding([0, 8]) ) (color_button([0.45, 0.25, 0.57])) (color_button([0.15, 0.59, 0.64]))