summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpml68 <contact@pml68.dev>2025-04-18 00:52:13 +0200
committerpml68 <contact@pml68.dev>2025-04-18 00:52:13 +0200
commit1683717e93899d4c90641e605bfc96cbc2bf5ef1 (patch)
tree1eac30071c3b82ffaff2b361d0078213c787798a
parentrefactor: inline Dark and Light theme definitions, remove toml files (diff)
downloadiced-builder-1683717e93899d4c90641e605bfc96cbc2bf5ef1.tar.gz
fix: `iced` 0.14 codegen
-rw-r--r--Cargo.lock43
-rw-r--r--src/types/project.rs2
-rwxr-xr-xsrc/types/rendered_element.rs13
3 files changed, 32 insertions, 26 deletions
diff --git a/Cargo.lock b/Cargo.lock
index e8a5b71..4f0a992 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -187,7 +187,7 @@ dependencies = [
"enumflags2",
"futures-channel",
"futures-util",
- "rand 0.9.0",
+ "rand 0.9.1",
"raw-window-handle",
"serde",
"serde_repr",
@@ -1945,7 +1945,7 @@ dependencies = [
[[package]]
name = "iced"
version = "0.14.0-dev"
-source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#4f933c3b8919a115fa82d9aee94ec5b1c81c4dfe"
+source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#b6433c4637ddf4697154feeb14c66e06200e4e1b"
dependencies = [
"iced_core",
"iced_debug",
@@ -1980,7 +1980,7 @@ dependencies = [
[[package]]
name = "iced_beacon"
version = "0.14.0-dev"
-source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#4f933c3b8919a115fa82d9aee94ec5b1c81c4dfe"
+source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#b6433c4637ddf4697154feeb14c66e06200e4e1b"
dependencies = [
"bincode",
"futures",
@@ -2021,7 +2021,7 @@ dependencies = [
[[package]]
name = "iced_core"
version = "0.14.0-dev"
-source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#4f933c3b8919a115fa82d9aee94ec5b1c81c4dfe"
+source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#b6433c4637ddf4697154feeb14c66e06200e4e1b"
dependencies = [
"bitflags 2.9.0",
"bytes",
@@ -2050,7 +2050,7 @@ dependencies = [
[[package]]
name = "iced_debug"
version = "0.14.0-dev"
-source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#4f933c3b8919a115fa82d9aee94ec5b1c81c4dfe"
+source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#b6433c4637ddf4697154feeb14c66e06200e4e1b"
dependencies = [
"iced_beacon",
"iced_core",
@@ -2060,7 +2060,7 @@ dependencies = [
[[package]]
name = "iced_devtools"
version = "0.14.0-dev"
-source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#4f933c3b8919a115fa82d9aee94ec5b1c81c4dfe"
+source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#b6433c4637ddf4697154feeb14c66e06200e4e1b"
dependencies = [
"iced_debug",
"iced_program",
@@ -2100,7 +2100,7 @@ dependencies = [
[[package]]
name = "iced_futures"
version = "0.14.0-dev"
-source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#4f933c3b8919a115fa82d9aee94ec5b1c81c4dfe"
+source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#b6433c4637ddf4697154feeb14c66e06200e4e1b"
dependencies = [
"futures",
"iced_core",
@@ -2114,7 +2114,7 @@ dependencies = [
[[package]]
name = "iced_graphics"
version = "0.14.0-dev"
-source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#4f933c3b8919a115fa82d9aee94ec5b1c81c4dfe"
+source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#b6433c4637ddf4697154feeb14c66e06200e4e1b"
dependencies = [
"bitflags 2.9.0",
"bytemuck",
@@ -2135,7 +2135,7 @@ dependencies = [
[[package]]
name = "iced_program"
version = "0.14.0-dev"
-source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#4f933c3b8919a115fa82d9aee94ec5b1c81c4dfe"
+source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#b6433c4637ddf4697154feeb14c66e06200e4e1b"
dependencies = [
"iced_graphics",
"iced_runtime",
@@ -2144,7 +2144,7 @@ dependencies = [
[[package]]
name = "iced_renderer"
version = "0.14.0-dev"
-source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#4f933c3b8919a115fa82d9aee94ec5b1c81c4dfe"
+source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#b6433c4637ddf4697154feeb14c66e06200e4e1b"
dependencies = [
"iced_graphics",
"iced_tiny_skia",
@@ -2156,7 +2156,7 @@ dependencies = [
[[package]]
name = "iced_runtime"
version = "0.14.0-dev"
-source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#4f933c3b8919a115fa82d9aee94ec5b1c81c4dfe"
+source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#b6433c4637ddf4697154feeb14c66e06200e4e1b"
dependencies = [
"bytes",
"iced_core",
@@ -2169,7 +2169,7 @@ dependencies = [
[[package]]
name = "iced_tiny_skia"
version = "0.14.0-dev"
-source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#4f933c3b8919a115fa82d9aee94ec5b1c81c4dfe"
+source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#b6433c4637ddf4697154feeb14c66e06200e4e1b"
dependencies = [
"bytemuck",
"cosmic-text",
@@ -2186,7 +2186,7 @@ dependencies = [
[[package]]
name = "iced_wgpu"
version = "0.14.0-dev"
-source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#4f933c3b8919a115fa82d9aee94ec5b1c81c4dfe"
+source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#b6433c4637ddf4697154feeb14c66e06200e4e1b"
dependencies = [
"bitflags 2.9.0",
"bytemuck",
@@ -2207,7 +2207,7 @@ dependencies = [
[[package]]
name = "iced_widget"
version = "0.14.0-dev"
-source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#4f933c3b8919a115fa82d9aee94ec5b1c81c4dfe"
+source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#b6433c4637ddf4697154feeb14c66e06200e4e1b"
dependencies = [
"iced_renderer",
"iced_runtime",
@@ -2225,7 +2225,7 @@ dependencies = [
[[package]]
name = "iced_winit"
version = "0.14.0-dev"
-source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#4f933c3b8919a115fa82d9aee94ec5b1c81c4dfe"
+source = "git+https://github.com/pml68/iced?branch=feat%2Frehighlight-on-redraw#b6433c4637ddf4697154feeb14c66e06200e4e1b"
dependencies = [
"iced_debug",
"iced_program",
@@ -3665,9 +3665,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.95"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
dependencies = [
"unicode-ident",
]
@@ -3781,13 +3781,12 @@ dependencies = [
[[package]]
name = "rand"
-version = "0.9.0"
+version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
+checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
dependencies = [
"rand_chacha 0.9.0",
"rand_core 0.9.3",
- "zerocopy 0.8.24",
]
[[package]]
@@ -4602,9 +4601,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "svg_fmt"
-version = "0.4.4"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce5d813d71d82c4cbc1742135004e4a79fd870214c155443451c139c9470a0aa"
+checksum = "0193cc4331cfd2f3d2011ef287590868599a2f33c3e69bc22c1a3d3acf9e02fb"
[[package]]
name = "svgtypes"
diff --git a/src/types/project.rs b/src/types/project.rs
index 50cbb69..145ab18 100644
--- a/src/types/project.rs
+++ b/src/types/project.rs
@@ -103,7 +103,7 @@ use iced::{{widget::{{{imports}}},Element}};
{theme_imports}
fn main() -> iced::Result {{
- iced::application("{}", State::update, State::view).theme(State::theme).run()
+ iced::application(State::default, State::update, State::view).title("{}").theme(State::theme).run()
}}
#[derive(Default)]
diff --git a/src/types/rendered_element.rs b/src/types/rendered_element.rs
index bd8187e..9639299 100755
--- a/src/types/rendered_element.rs
+++ b/src/types/rendered_element.rs
@@ -223,7 +223,14 @@ impl RenderedElement {
match &self.name {
ElementName::Container => {
imports = format!("{imports}container,");
- view = format!("{view}\ncontainer({elements}){options}");
+ view = format!(
+ "{view}\ncontainer({}){options}",
+ if elements.is_empty() {
+ String::from("\"\"")
+ } else {
+ elements.to_string()
+ }
+ );
}
ElementName::Row => {
imports = format!("{imports}row,");
@@ -237,7 +244,7 @@ impl RenderedElement {
imports = format!("{imports}text,");
view = format!(
"{view}\ntext(\"{}\"){options}",
- if *string == String::new() {
+ if string.is_empty() {
"New Text"
} else {
string
@@ -248,7 +255,7 @@ impl RenderedElement {
imports = format!("{imports}button,");
view = format!(
"{view}\nbutton(\"{}\"){options}",
- if *string == String::new() {
+ if string.is_empty() {
"New Button"
} else {
string