diff options
Diffstat (limited to '')
| -rw-r--r-- | Cargo.lock | 98 | ||||
| -rwxr-xr-x | src/types/rendered_element.rs | 124 |
2 files changed, 111 insertions, 111 deletions
@@ -222,7 +222,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532" dependencies = [ - "event-listener 5.4.0", + "event-listener 5.4.1", "event-listener-strategy", "futures-core", "pin-project-lite", @@ -311,11 +311,11 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.4.0" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" +checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc" dependencies = [ - "event-listener 5.4.0", + "event-listener 5.4.1", "event-listener-strategy", "pin-project-lite", ] @@ -344,7 +344,7 @@ dependencies = [ "async-task", "blocking", "cfg-if", - "event-listener 5.4.0", + "event-listener 5.4.1", "futures-lite", "rustix 1.0.8", ] @@ -682,9 +682,9 @@ checksum = "0da45bc31171d8d6960122e222a67740df867c1dd53b4d51caa297084c185cab" [[package]] name = "cc" -version = "1.2.30" +version = "1.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7" +checksum = "c3a42d84bb6b69d3a8b3eaacf0d88f179e1929695e1ad012b6cf64d9caaa5fd2" dependencies = [ "jobserver", "libc", @@ -1180,7 +1180,7 @@ dependencies = [ "cc", "memchr", "rustc_version", - "toml 0.9.4", + "toml 0.9.5", "vswhom", "winreg 0.55.0", ] @@ -1290,9 +1290,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "5.4.0" +version = "5.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" +checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" dependencies = [ "concurrent-queue", "parking", @@ -1305,7 +1305,7 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" dependencies = [ - "event-listener 5.4.0", + "event-listener 5.4.1", "pin-project-lite", ] @@ -1526,9 +1526,9 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532" +checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad" dependencies = [ "fastrand", "futures-core", @@ -1759,9 +1759,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17da50a276f1e01e0ba6c029e47b7100754904ee8a278f886546e98575380785" +checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386" dependencies = [ "atomic-waker", "bytes", @@ -1956,7 +1956,7 @@ dependencies = [ [[package]] name = "iced" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#5453ec4e9543148bda165f752098a3ca6c8aeba9" +source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#951589019125605a927efa14c616433cd6e4bb95" dependencies = [ "iced_core", "iced_debug", @@ -1972,7 +1972,7 @@ dependencies = [ [[package]] name = "iced_anim" version = "0.2.1" -source = "git+https://github.com/pml68/iced_anim?branch=main#314f68a9403e6efe0cc5b97614c4e730e28592e2" +source = "git+https://github.com/pml68/iced_anim?branch=main#bbc458f95489c818bfa66333bad48d6478cba51d" dependencies = [ "iced", "iced_anim_derive", @@ -1981,7 +1981,7 @@ dependencies = [ [[package]] name = "iced_anim_derive" version = "0.2.0" -source = "git+https://github.com/pml68/iced_anim?branch=main#314f68a9403e6efe0cc5b97614c4e730e28592e2" +source = "git+https://github.com/pml68/iced_anim?branch=main#bbc458f95489c818bfa66333bad48d6478cba51d" dependencies = [ "quote", "syn", @@ -2008,7 +2008,7 @@ dependencies = [ "thiserror 2.0.12", "tokio", "tokio-stream", - "toml 0.9.4", + "toml 0.9.5", "windows_exe_info", "xdg", ] @@ -2016,7 +2016,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#5453ec4e9543148bda165f752098a3ca6c8aeba9" +source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#951589019125605a927efa14c616433cd6e4bb95" dependencies = [ "bitflags 2.9.1", "bytes", @@ -2044,7 +2044,7 @@ dependencies = [ [[package]] name = "iced_debug" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#5453ec4e9543148bda165f752098a3ca6c8aeba9" +source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#951589019125605a927efa14c616433cd6e4bb95" dependencies = [ "iced_core", "iced_futures", @@ -2076,14 +2076,14 @@ dependencies = [ "serde", "serde_json", "sha2", - "toml 0.9.4", + "toml 0.9.5", "zip", ] [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#5453ec4e9543148bda165f752098a3ca6c8aeba9" +source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#951589019125605a927efa14c616433cd6e4bb95" dependencies = [ "futures", "iced_core", @@ -2097,7 +2097,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#5453ec4e9543148bda165f752098a3ca6c8aeba9" +source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#951589019125605a927efa14c616433cd6e4bb95" dependencies = [ "bitflags 2.9.1", "bytemuck", @@ -2117,7 +2117,7 @@ dependencies = [ [[package]] name = "iced_material" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced_material?branch=iced%2Fpersonal#1f9874800de34e90c8a13e1ba7ba100e8a4d812f" +source = "git+https://github.com/pml68/iced_material?branch=iced%2Fpersonal#26e2c2f8ebd95f98711c22b80a214fb5266a184a" dependencies = [ "arc-swap", "iced_anim", @@ -2130,7 +2130,7 @@ dependencies = [ [[package]] name = "iced_program" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#5453ec4e9543148bda165f752098a3ca6c8aeba9" +source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#951589019125605a927efa14c616433cd6e4bb95" dependencies = [ "iced_graphics", "iced_runtime", @@ -2139,7 +2139,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#5453ec4e9543148bda165f752098a3ca6c8aeba9" +source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#951589019125605a927efa14c616433cd6e4bb95" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2151,7 +2151,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#5453ec4e9543148bda165f752098a3ca6c8aeba9" +source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#951589019125605a927efa14c616433cd6e4bb95" dependencies = [ "bytes", "iced_core", @@ -2164,7 +2164,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#5453ec4e9543148bda165f752098a3ca6c8aeba9" +source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#951589019125605a927efa14c616433cd6e4bb95" dependencies = [ "bytemuck", "cosmic-text", @@ -2181,7 +2181,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#5453ec4e9543148bda165f752098a3ca6c8aeba9" +source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#951589019125605a927efa14c616433cd6e4bb95" dependencies = [ "bitflags 2.9.1", "bytemuck", @@ -2201,7 +2201,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#5453ec4e9543148bda165f752098a3ca6c8aeba9" +source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#951589019125605a927efa14c616433cd6e4bb95" dependencies = [ "iced_renderer", "iced_runtime", @@ -2216,7 +2216,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.14.0-dev" -source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#5453ec4e9543148bda165f752098a3ca6c8aeba9" +source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#951589019125605a927efa14c616433cd6e4bb95" dependencies = [ "iced_debug", "iced_program", @@ -2566,9 +2566,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libbz2-rs-sys" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775bf80d5878ab7c2b1080b5351a48b2f737d9f6f8b383574eebcc22be0dfccb" +checksum = "2c4a545a15244c7d945065b5d392b2d2d7f21526fba56ce51467b06ed445e8f7" [[package]] name = "libc" @@ -3614,9 +3614,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.9.0" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee9b2fa7a4517d2c91ff5bc6c297a427a96749d15f98fcdbb22c05571a4d4b7" +checksum = "b5bd19146350fe804f7cb2669c851c03d69da628803dab0d98018142aaa5d829" dependencies = [ "cfg-if", "concurrent-queue", @@ -4407,9 +4407,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.5" +version = "1.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" +checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" dependencies = [ "libc", ] @@ -4883,9 +4883,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.47.0" +version = "1.47.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43864ed400b6043a4757a25c7a64a8efde741aed79a056a2fb348a406701bb35" +checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" dependencies = [ "backtrace", "bytes", @@ -4931,9 +4931,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.15" +version = "0.7.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df" +checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" dependencies = [ "bytes", "futures-core", @@ -4956,9 +4956,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ae868b5a0f67631c14589f7e250c1ea2c574ee5ba21c6c8dd4b1485705a5a1" +checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8" dependencies = [ "indexmap", "serde", @@ -5002,9 +5002,9 @@ dependencies = [ [[package]] name = "toml_parser" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97200572db069e74c512a14117b296ba0a80a30123fbbb5aa1f4a348f639ca30" +checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10" dependencies = [ "winnow", ] @@ -6475,7 +6475,7 @@ dependencies = [ "async-trait", "blocking", "enumflags2", - "event-listener 5.4.0", + "event-listener 5.4.1", "futures-core", "futures-lite", "hex", @@ -6599,9 +6599,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.2" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" +checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b" dependencies = [ "yoke", "zerofrom", diff --git a/src/types/rendered_element.rs b/src/types/rendered_element.rs index 85767fc..f20c86e 100755 --- a/src/types/rendered_element.rs +++ b/src/types/rendered_element.rs @@ -323,75 +323,75 @@ impl<'a> From<RenderedElement> for Element<'a, Message> { ElementName::Image(p) => { widget::image(p).apply_options(copy.options).into() } - ElementName::Container => if child_elements.len() == 1 { - widget::container(child_elements[0].clone()) - } else { - widget::container(text("New Container")).style( - |theme: &iced::Theme| widget::container::Style { - border: iced::Border { - color: theme.palette().text, - - width: 2.0, - radius: 4.into(), - }, - ..Default::default() + ElementName::Container => { + widget::container(if child_elements.len() == 1 { + Element::from(child_elements[0].clone()) + } else { + Element::from(text("New Container")) + }) + .style(|theme: &iced::Theme| widget::container::Style { + border: iced::Border { + color: theme.palette().primary.scale_alpha(0.6), + + width: 2.0, + radius: 4.into(), }, - ) + background: Some( + theme.palette().primary.scale_alpha(0.25).into(), + ), + ..Default::default() + }) + .padding(20) + .apply_options(copy.options) + .into() } - .padding(20) - .apply_options(copy.options) - .into(), ElementName::Row => { - if !child_elements.is_empty() { - widget::Row::with_children( - child_elements.into_iter().map(Into::into), - ) - .padding(20) - .apply_options(copy.options) - .into() + widget::container(if !child_elements.is_empty() { + widget::row(child_elements.into_iter().map(Into::into)) + .padding(20) + .apply_options(copy.options) } else { - widget::container( - widget::row![text("New Row")] - .padding(20) - .apply_options(copy.options), - ) - .style(|theme: &iced::Theme| widget::container::Style { - border: iced::Border { - color: theme.palette().text, - - width: 2.0, - radius: 4.into(), - }, - ..Default::default() - }) - .into() - } + widget::row![text("New Row")] + .padding(20) + .apply_options(copy.options) + }) + .style(|theme: &iced::Theme| widget::container::Style { + border: iced::Border { + color: theme.palette().danger.scale_alpha(0.6), + + width: 2.0, + radius: 4.into(), + }, + background: Some( + theme.palette().danger.scale_alpha(0.25).into(), + ), + ..Default::default() + }) + .into() } ElementName::Column => { - if !child_elements.is_empty() { - widget::Column::with_children( - child_elements.into_iter().map(Into::into), - ) - .padding(20) - .apply_options(copy.options) - .into() + widget::container(if !child_elements.is_empty() { + widget::column(child_elements.into_iter().map(Into::into)) + .padding(20) + .apply_options(copy.options) } else { - widget::container( - widget::column![text("New Column")] - .padding(20) - .apply_options(copy.options), - ) - .style(|theme: &iced::Theme| widget::container::Style { - border: iced::Border { - color: theme.palette().text, - - width: 2.0, - radius: 4.into(), - }, - ..Default::default() - }) - .into() - } + widget::column![text("New Column")] + .padding(20) + .apply_options(copy.options) + }) + .style(|theme: &iced::Theme| widget::container::Style { + border: iced::Border { + color: theme.palette().success.scale_alpha(0.6), + + width: 2.0, + radius: 4.into(), + }, + background: Some( + theme.palette().success.scale_alpha(0.25).into(), + ), + ..Default::default() + }) + .into() } }; |