summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPolesznyák Márk <contact@pml68.dev>2025-12-12 11:25:55 +0100
committerPolesznyák Márk <contact@pml68.dev>2025-12-12 11:25:55 +0100
commit9e66d112564630e5c8e1cc8ab77c80f3bcd70922 (patch)
tree6a454541737edf703907e89dd8c7167aa7fab546
parentfeat: make it impossible (tm) to open multiple dialogs at once (diff)
downloadiced-builder-9e66d112564630e5c8e1cc8ab77c80f3bcd70922.tar.gz
chore: update deps
-rw-r--r--Cargo.lock152
-rw-r--r--Cargo.toml4
-rw-r--r--src/main.rs12
-rw-r--r--src/types.rs3
4 files changed, 86 insertions, 85 deletions
diff --git a/Cargo.lock b/Cargo.lock
index da0b78b..7dfbcac 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -620,9 +620,9 @@ checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609"
[[package]]
name = "cc"
-version = "1.2.48"
+version = "1.2.49"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c481bdbf0ed3b892f6f806287d72acd515b352a4ec27a208489b8c1bc839633a"
+checksum = "90583009037521a116abf44494efecd645ba48b6622457080f080b85544e2215"
dependencies = [
"find-msvc-tools",
"jobserver",
@@ -922,7 +922,8 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
[[package]]
name = "cryoglyph"
version = "0.1.0"
-source = "git+https://github.com/iced-rs/cryoglyph.git?rev=99b46959369f38a06c11353bf1be81d383b289fc#99b46959369f38a06c11353bf1be81d383b289fc"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08bc795bdbccdbd461736fb163930a009da6597b226d6f6fce33e7a8eb6ec519"
dependencies = [
"cosmic-text",
"etagere",
@@ -1566,9 +1567,9 @@ dependencies = [
[[package]]
name = "gif"
-version = "0.14.0"
+version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f954a9e9159ec994f73a30a12b96a702dde78f5547bcb561174597924f7d4162"
+checksum = "f5df2ba84018d80c213569363bdcd0c64e6933c67fe4c1d60ecf822971a3c35e"
dependencies = [
"color_quant",
"weezl",
@@ -1857,9 +1858,9 @@ dependencies = [
[[package]]
name = "hyper-util"
-version = "0.1.18"
+version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56"
+checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f"
dependencies = [
"base64",
"bytes",
@@ -1883,8 +1884,8 @@ dependencies = [
[[package]]
name = "iced"
-version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c21289df4ad53d2a54e2750d1aead67948777fe2"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced?branch=master#c532ad216b1ed9398775a1ad95234165aa5ee649"
dependencies = [
"iced_core",
"iced_debug",
@@ -1899,8 +1900,8 @@ dependencies = [
[[package]]
name = "iced_anim"
-version = "0.2.1"
-source = "git+https://github.com/BradySimon/iced_anim?branch=iced%2Fmaster#16164ea68bca8316e5c2ce784b544fca3ded767f"
+version = "0.3.0"
+source = "git+https://github.com/BradySimon/iced_anim?branch=iced%2Fmaster#d50858f66325ea892924b5accb478ea53f6277f4"
dependencies = [
"iced",
"iced_anim_derive",
@@ -1909,7 +1910,7 @@ dependencies = [
[[package]]
name = "iced_anim_derive"
version = "0.2.0"
-source = "git+https://github.com/BradySimon/iced_anim?branch=iced%2Fmaster#16164ea68bca8316e5c2ce784b544fca3ded767f"
+source = "git+https://github.com/BradySimon/iced_anim?branch=iced%2Fmaster#d50858f66325ea892924b5accb478ea53f6277f4"
dependencies = [
"quote",
"syn 2.0.111",
@@ -1929,7 +1930,6 @@ dependencies = [
"iced_drop",
"iced_fontello",
"iced_material",
- "iced_widget",
"rfd",
"rust-format",
"serde",
@@ -1944,8 +1944,8 @@ dependencies = [
[[package]]
name = "iced_core"
-version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c21289df4ad53d2a54e2750d1aead67948777fe2"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced?branch=master#c532ad216b1ed9398775a1ad95234165aa5ee649"
dependencies = [
"bitflags 2.10.0",
"bytes",
@@ -1971,8 +1971,8 @@ dependencies = [
[[package]]
name = "iced_debug"
-version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c21289df4ad53d2a54e2750d1aead67948777fe2"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced?branch=master#c532ad216b1ed9398775a1ad95234165aa5ee649"
dependencies = [
"iced_core",
"iced_futures",
@@ -1982,7 +1982,7 @@ dependencies = [
[[package]]
name = "iced_dialog"
version = "0.14.0-dev"
-source = "git+https://git.sr.ht/~pml68/iced_dialog?branch=master#619c81797b89847c39ffc17db2fa2340215d2ea3"
+source = "git+https://git.sr.ht/~pml68/iced_dialog?branch=master#84a50b7f11db6d0b6cf1bbd7e233d11aaad621c7"
dependencies = [
"iced_core",
"iced_widget",
@@ -1991,7 +1991,7 @@ dependencies = [
[[package]]
name = "iced_drop"
version = "0.1.0"
-source = "git+https://github.com/pml68/iced_drop?branch=master#65cc8e17fbba4376c6068393be5f559a3f269015"
+source = "git+https://github.com/pml68/iced_drop?branch=master#8c85aaef1082e9ae566eba287aace670041094fa"
dependencies = [
"iced",
]
@@ -2011,8 +2011,8 @@ dependencies = [
[[package]]
name = "iced_futures"
-version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c21289df4ad53d2a54e2750d1aead67948777fe2"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced?branch=master#c532ad216b1ed9398775a1ad95234165aa5ee649"
dependencies = [
"futures",
"iced_core",
@@ -2025,8 +2025,8 @@ dependencies = [
[[package]]
name = "iced_graphics"
-version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c21289df4ad53d2a54e2750d1aead67948777fe2"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced?branch=master#c532ad216b1ed9398775a1ad95234165aa5ee649"
dependencies = [
"bitflags 2.10.0",
"bytemuck",
@@ -2046,7 +2046,7 @@ dependencies = [
[[package]]
name = "iced_material"
version = "0.1.0"
-source = "git+https://git.sr.ht/~pml68/iced_material?branch=master#e93ac5652caa398b47ec4700557ab59a917bda03"
+source = "git+https://git.sr.ht/~pml68/iced_material?branch=master#d1d689a67a275b69fc2f8e41b3e916f31eef3d3d"
dependencies = [
"iced_anim",
"iced_dialog",
@@ -2057,8 +2057,8 @@ dependencies = [
[[package]]
name = "iced_program"
-version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c21289df4ad53d2a54e2750d1aead67948777fe2"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced?branch=master#c532ad216b1ed9398775a1ad95234165aa5ee649"
dependencies = [
"iced_graphics",
"iced_runtime",
@@ -2066,8 +2066,8 @@ dependencies = [
[[package]]
name = "iced_renderer"
-version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c21289df4ad53d2a54e2750d1aead67948777fe2"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced?branch=master#c532ad216b1ed9398775a1ad95234165aa5ee649"
dependencies = [
"iced_graphics",
"iced_tiny_skia",
@@ -2078,8 +2078,8 @@ dependencies = [
[[package]]
name = "iced_runtime"
-version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c21289df4ad53d2a54e2750d1aead67948777fe2"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced?branch=master#c532ad216b1ed9398775a1ad95234165aa5ee649"
dependencies = [
"bytes",
"iced_core",
@@ -2090,8 +2090,8 @@ dependencies = [
[[package]]
name = "iced_tiny_skia"
-version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c21289df4ad53d2a54e2750d1aead67948777fe2"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced?branch=master#c532ad216b1ed9398775a1ad95234165aa5ee649"
dependencies = [
"bytemuck",
"cosmic-text",
@@ -2107,8 +2107,8 @@ dependencies = [
[[package]]
name = "iced_wgpu"
-version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c21289df4ad53d2a54e2750d1aead67948777fe2"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced?branch=master#c532ad216b1ed9398775a1ad95234165aa5ee649"
dependencies = [
"bitflags 2.10.0",
"bytemuck",
@@ -2127,8 +2127,8 @@ dependencies = [
[[package]]
name = "iced_widget"
-version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c21289df4ad53d2a54e2750d1aead67948777fe2"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced?branch=master#c532ad216b1ed9398775a1ad95234165aa5ee649"
dependencies = [
"iced_renderer",
"log",
@@ -2140,8 +2140,8 @@ dependencies = [
[[package]]
name = "iced_winit"
-version = "0.14.0-dev"
-source = "git+https://github.com/iced-rs/iced?branch=master#c21289df4ad53d2a54e2750d1aead67948777fe2"
+version = "0.15.0-dev"
+source = "git+https://github.com/iced-rs/iced?branch=master#c532ad216b1ed9398775a1ad95234165aa5ee649"
dependencies = [
"iced_debug",
"iced_program",
@@ -2204,9 +2204,9 @@ checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
[[package]]
name = "icu_properties"
-version = "2.1.1"
+version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99"
+checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec"
dependencies = [
"icu_collections",
"icu_locale_core",
@@ -2218,9 +2218,9 @@ dependencies = [
[[package]]
name = "icu_properties_data"
-version = "2.1.1"
+version = "2.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899"
+checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af"
[[package]]
name = "icu_provider"
@@ -2268,7 +2268,7 @@ dependencies = [
"byteorder-lite",
"color_quant",
"exr",
- "gif 0.14.0",
+ "gif 0.14.1",
"image-webp",
"moxcms",
"num-traits",
@@ -2279,7 +2279,7 @@ dependencies = [
"rgb",
"tiff",
"zune-core 0.5.0",
- "zune-jpeg 0.5.5",
+ "zune-jpeg 0.5.6",
]
[[package]]
@@ -2462,9 +2462,9 @@ checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8"
[[package]]
name = "libc"
-version = "0.2.177"
+version = "0.2.178"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091"
[[package]]
name = "libfuzzer-sys"
@@ -2553,9 +2553,9 @@ dependencies = [
[[package]]
name = "log"
-version = "0.4.28"
+version = "0.4.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
[[package]]
name = "loop9"
@@ -2679,9 +2679,9 @@ dependencies = [
[[package]]
name = "mio"
-version = "1.1.0"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
+checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc"
dependencies = [
"libc",
"wasi",
@@ -3589,7 +3589,7 @@ version = "3.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
dependencies = [
- "toml_edit 0.23.7",
+ "toml_edit 0.23.9",
]
[[package]]
@@ -3622,9 +3622,9 @@ dependencies = [
[[package]]
name = "pxfm"
-version = "0.1.26"
+version = "0.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3502d6155304a4173a5f2c34b52b7ed0dd085890326cb50fd625fdf39e86b3b"
+checksum = "7186d3822593aa4393561d186d1393b3923e9d6163d3fbfd6e825e3e6cf3e6a8"
dependencies = [
"num-traits",
]
@@ -3850,9 +3850,9 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
[[package]]
name = "reqwest"
-version = "0.12.24"
+version = "0.12.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f"
+checksum = "b6eff9328d40131d43bd911d42d79eb6a47312002a4daefc9e37f17e74a7701a"
dependencies = [
"base64",
"bytes",
@@ -4283,9 +4283,9 @@ dependencies = [
[[package]]
name = "simd-adler32"
-version = "0.3.7"
+version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
[[package]]
name = "simd_helpers"
@@ -4329,9 +4329,9 @@ checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
[[package]]
name = "slotmap"
-version = "1.0.7"
+version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a"
+checksum = "bdd58c3c93c3d278ca835519292445cb4b0d4dc59ccfdf7ceadaab3f8aeb4038"
dependencies = [
"version_check",
]
@@ -4887,9 +4887,9 @@ dependencies = [
[[package]]
name = "toml_edit"
-version = "0.23.7"
+version = "0.23.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
+checksum = "5d7cbc3b4b49633d57a0509303158ca50de80ae32c265093b24c414705807832"
dependencies = [
"indexmap",
"toml_datetime 0.7.3",
@@ -4935,9 +4935,9 @@ dependencies = [
[[package]]
name = "tower-http"
-version = "0.6.7"
+version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf146f99d442e8e68e585f5d798ccd3cad9a7835b917e09728880a862706456"
+checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8"
dependencies = [
"bitflags 2.10.0",
"bytes",
@@ -5012,9 +5012,9 @@ dependencies = [
[[package]]
name = "two-face"
-version = "0.4.4"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d112cfd41c1387546416bcf49c4ae2a1fcacda0d42c9e97120e9798c90c0923"
+checksum = "39e51b6e60e545cfdae5a4639ff423818f52372211a8d9a3e892b4b0761f76b2"
dependencies = [
"serde",
"serde_derive",
@@ -5082,9 +5082,9 @@ checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d"
[[package]]
name = "unicode-script"
-version = "0.5.7"
+version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f"
+checksum = "383ad40bb927465ec0ce7720e033cb4ca06912855fc35db31b5755d0de75b1ee"
[[package]]
name = "unicode-segmentation"
@@ -5163,12 +5163,12 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
[[package]]
name = "uuid"
-version = "1.18.1"
+version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
+checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a"
dependencies = [
"js-sys",
- "serde",
+ "serde_core",
"wasm-bindgen",
]
@@ -6375,18 +6375,18 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524"
[[package]]
name = "zerocopy"
-version = "0.8.30"
+version = "0.8.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ea879c944afe8a2b25fef16bb4ba234f47c694565e97383b36f3a878219065c"
+checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3"
dependencies = [
"zerocopy-derive",
]
[[package]]
name = "zerocopy-derive"
-version = "0.8.30"
+version = "0.8.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf955aa904d6040f70dc8e9384444cb1030aed272ba3cb09bbc4ab9e7c1f34f5"
+checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a"
dependencies = [
"proc-macro2",
"quote",
@@ -6569,9 +6569,9 @@ dependencies = [
[[package]]
name = "zune-jpeg"
-version = "0.5.5"
+version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6fb7703e32e9a07fb3f757360338b3a567a5054f21b5f52a666752e333d58e"
+checksum = "f520eebad972262a1dde0ec455bce4f8b298b1e5154513de58c114c4c54303e8"
dependencies = [
"zune-core 0.5.0",
]
diff --git a/Cargo.toml b/Cargo.toml
index d8a775e..dfea4e5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["gui", "ui", "graphics", "interface", "widgets"]
rust-version = "1.88.0"
[dependencies]
-iced.version = "0.14.0-dev"
+iced.version = "0.15.0-dev"
iced.default-features = false
iced.features = [
"wgpu",
@@ -25,8 +25,6 @@ iced.features = [
"linux-theme-detection",
]
-iced_widget = "0.14.0-dev"
-
iced_material.git = "https://git.sr.ht/~pml68/iced_material"
iced_material.branch = "master"
iced_material.features = ["animate", "serde", "dialog", "svg"]
diff --git a/src/main.rs b/src/main.rs
index 695d742..107dd3f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -499,7 +499,7 @@ impl IcedBuilder {
self.dialog.close();
}
}
- Message::WindowEvent(window::Event::CloseRequested) => {
+ Message::CloseRequest => {
if self.is_dirty {
self.is_dialog_open = true;
self.dialog = Dialog::unsaved_changes(
@@ -510,14 +510,18 @@ impl IcedBuilder {
return self.update(Message::CloseApp);
}
}
- Message::WindowEvent(_) => {}
}
Task::none()
}
fn subscription(&self) -> iced::Subscription<Message> {
- let keyboard = keyboard::on_key_press(|key, modifiers| {
+ let keyboard = keyboard::listen().filter_map(|event| {
+ let keyboard::Event::KeyPressed { key, modifiers, .. } = event
+ else {
+ return None;
+ };
+
if modifiers.command() {
match key.as_ref() {
keyboard::Key::Character("o") => Some(Message::OpenFile),
@@ -541,7 +545,7 @@ impl IcedBuilder {
});
let window_events =
- window::events().map(|(_id, event)| Message::WindowEvent(event));
+ window::close_requests().map(|_id| Message::CloseRequest);
let system_theme = theme_changes().map(Message::SystemThemeChanged);
diff --git a/src/types.rs b/src/types.rs
index 0014090..e3f0a54 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -8,7 +8,6 @@ pub use element_name::ElementName;
use iced::advanced::widget::Id;
use iced::theme::Mode;
use iced::widget::{pane_grid, text_editor};
-use iced::window;
use iced_anim::Event;
use iced_material::Theme;
pub use project::Project;
@@ -51,7 +50,7 @@ pub enum Message {
FileSaved(Result<PathBuf, Error>),
CloseApp,
EscapePressed,
- WindowEvent(window::Event),
+ CloseRequest,
}
#[derive(Debug, Clone, Copy)]