summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpml68 <contact@pml68.dev>2025-03-31 01:05:24 +0200
committerpml68 <contact@pml68.dev>2025-04-15 23:46:01 +0200
commit1aeba3cbd0ae7b53ffd2c47f325864e3ec3b0210 (patch)
tree2b0a479d09d9fc954c727888576a5945582aec22
parentfeat: add shadow color, impl `button::Catalog` and `text::Catalog` (diff)
downloadiced-builder-1aeba3cbd0ae7b53ffd2c47f325864e3ec3b0210.tar.gz
fix: merge conflict blobs [skip ci]
Diffstat (limited to '')
-rw-r--r--src/main.rs17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/main.rs b/src/main.rs
index 7728e63..63e9deb 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -174,15 +174,12 @@ impl App {
self.editor_content.perform(action);
}
}
- Message::RefreshEditorContent => {
- match self.project.app_code(&self.config) {
- Ok(code) => {
- self.editor_content =
- text_editor::Content::with_text(&code);
- }
- Err(error) => return error_dialog(error),
+ Message::RefreshEditorContent => match self.project.app_code() {
+ Ok(code) => {
+ self.editor_content =
+ text_editor::Content::with_text(&code);
}
- Err(error) => Task::future(error_dialog(error)).discard(),
+ Err(error) => return error_dialog(error),
},
Message::DropNewElement(name, point, _) => {
return iced_drop::zones_on_point(
@@ -279,7 +276,7 @@ impl App {
self.is_dirty = false;
self.is_loading = true;
return Task::perform(
- Project::from_file(self.config.clone()),
+ Project::from_file(),
Message::FileOpened,
)
.chain(close_dialog_task);
@@ -309,7 +306,7 @@ impl App {
self.is_loading = true;
return Task::perform(
- Project::from_file(self.config.clone()),
+ Project::from_file(),
Message::FileOpened,
);
} else {