diff options
| -rw-r--r-- | iced_builder/src/dialogs.rs | 2 | ||||
| -rw-r--r-- | iced_builder/src/main.rs | 26 | ||||
| -rw-r--r-- | iced_builder/src/types/project.rs | 2 |
3 files changed, 17 insertions, 13 deletions
diff --git a/iced_builder/src/dialogs.rs b/iced_builder/src/dialogs.rs index 18e3c0d..edd6cea 100644 --- a/iced_builder/src/dialogs.rs +++ b/iced_builder/src/dialogs.rs @@ -1,7 +1,7 @@ use rfd::{MessageButtons, MessageDialog, MessageDialogResult, MessageLevel}; pub fn error_dialog(description: impl Into<String>) { - MessageDialog::new() + let _ = MessageDialog::new() .set_level(MessageLevel::Error) .set_buttons(MessageButtons::Ok) .set_title("Oops! Something went wrong.") diff --git a/iced_builder/src/main.rs b/iced_builder/src/main.rs index 8adc15d..e42e854 100644 --- a/iced_builder/src/main.rs +++ b/iced_builder/src/main.rs @@ -256,24 +256,28 @@ impl App { } fn subscription(&self) -> iced::Subscription<Message> { - keyboard::on_key_press(|key, modifiers| match key.as_ref() { - keyboard::Key::Character("o") if modifiers.command() => Some(Message::OpenFile), - keyboard::Key::Character("s") if modifiers.command() => { - if modifiers.shift() { - Some(Message::SaveFileAs) - } else { - Some(Message::SaveFile) + keyboard::on_key_press(|key, modifiers| { + if modifiers.command() { + match key.as_ref() { + keyboard::Key::Character("o") => Some(Message::OpenFile), + keyboard::Key::Character("s") => Some(if modifiers.shift() { + Message::SaveFileAs + } else { + Message::SaveFile + }), + keyboard::Key::Character("n") => Some(Message::NewFile), + _ => None, } + } else { + None } - keyboard::Key::Character("n") if modifiers.command() => Some(Message::NewFile), - _ => None, }) } - fn view(&self) -> Element<Message> { + fn view(&self) -> Element<'_, Message> { let header = row![pick_list( THEMES, - Some(self.theme.target()).clone(), + Some(self.theme.target().clone()), |theme| { Message::ToggleTheme(theme.into()) } )] .width(200); diff --git a/iced_builder/src/types/project.rs b/iced_builder/src/types/project.rs index a33d3bb..3bd5975 100644 --- a/iced_builder/src/types/project.rs +++ b/iced_builder/src/types/project.rs @@ -86,7 +86,7 @@ impl Project { .ok_or(Error::DialogClosed)? }; - let contents = serde_json::to_string(&self.clone())?; + let contents = serde_json::to_string(&self)?; tokio::fs::write(&path, contents).await?; Ok(path) |