From 7d234641cb5ffb201e022c7f43aa97c3d9539e24 Mon Sep 17 00:00:00 2001 From: Joakim Hulthe Date: Sun, 15 Jun 2025 12:39:52 +0200 Subject: [PATCH] Add Ctrl+S and indicate when files are dirty --- src/app.rs | 97 ++++++++++++++++++++++++++++------------------ src/file_editor.rs | 18 +++++++-- src/painting.rs | 40 ++++++++++++------- src/text_editor.rs | 10 ++++- 4 files changed, 111 insertions(+), 54 deletions(-) diff --git a/src/app.rs b/src/app.rs index 2e43653..12d31a9 100644 --- a/src/app.rs +++ b/src/app.rs @@ -8,8 +8,8 @@ use std::{ use crate::{file_editor::FileEditor, preferences::Preferences, util::GuiSender}; use egui::{ - Align, Button, Color32, FontData, FontDefinitions, PointerButton, RichText, ScrollArea, Stroke, - Ui, + Align, Button, Color32, Context, FontData, FontDefinitions, Key, Modifiers, PointerButton, + RichText, ScrollArea, Stroke, }; #[derive(serde::Deserialize, serde::Serialize)] @@ -36,8 +36,8 @@ pub struct Jobs { } impl Jobs { - fn start(&mut self, ui: &mut Ui, job: impl FnOnce() -> Option + Send + 'static) { - let ctx = ui.ctx().clone(); + fn start(&mut self, ctx: &Context, job: impl FnOnce() -> Option + Send + 'static) { + let ctx = ctx.clone(); let actions_tx = self.actions_tx.clone(); self.handles.push(std::thread::spawn(move || { // start rendering the spinner thingy @@ -68,6 +68,12 @@ impl Tab { Tab::File(file_editor) => file_editor.title(), } } + + pub fn is_dirty(&self) -> bool { + match self { + Tab::File(file_editor) => file_editor.is_dirty, + } + } } pub type TabId = usize; @@ -182,7 +188,7 @@ impl App { Default::default() } - fn actions_tx(&self, ctx: &egui::Context) -> GuiSender { + fn actions_tx(&self, ctx: &Context) -> GuiSender { GuiSender::new(self.actions_tx.clone(), ctx) } @@ -211,7 +217,7 @@ impl eframe::App for App { eframe::set_value(storage, eframe::APP_KEY, self); } - fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) { + fn update(&mut self, ctx: &Context, _frame: &mut eframe::Frame) { self.preferences.apply(ctx); self.jobs.handles.retain(|job| !job.is_finished()); @@ -224,11 +230,11 @@ impl eframe::App for App { self.open_tab_index = Some(self.tabs.len().saturating_sub(1)); } - //ctx.input_mut(|input| { - // if input.consume_key(Modifiers::CTRL, Key::H) { - // self.buffer.push(BufferItem::Painting(Default::default())); - // } - //}); + ctx.input_mut(|input| { + if input.consume_key(Modifiers::CTRL, Key::S) { + self.save_active_tab(ctx); + } + }); egui::TopBottomPanel::top("top_panel").show(ctx, |ui| { egui::containers::menu::Bar::new().ui(ui, |ui| { @@ -243,7 +249,7 @@ impl eframe::App for App { #[cfg(not(target_arch = "wasm32"))] if ui.button("Open File").clicked() { - self.jobs.start(ui, move || { + self.jobs.start(ui.ctx(), move || { let file_path = rfd::FileDialog::new().pick_file()?; let text = fs::read_to_string(&file_path) @@ -268,6 +274,19 @@ impl eframe::App for App { } } + let can_save_file = self + .open_tab_index + .and_then(|i| self.tabs.get(i)) + .and_then(|(id, tab)| match tab { + Tab::File(file_editor) => Some((*id, file_editor)), + }) + .and_then(|(_, file_editor)| file_editor.path().zip(Some(file_editor))) + .is_some(); + + if ui.add_enabled(can_save_file, Button::new("Save")).clicked() { + self.save_active_tab(ui.ctx()); + } + let open_file = self.open_tab_index .and_then(|i| self.tabs.get(i)) @@ -275,26 +294,6 @@ impl eframe::App for App { Tab::File(file_editor) => Some((*id, file_editor)), }); - let open_file_with_path = open_file - .clone() - .and_then(|(_, file_editor)| file_editor.path().zip(Some(file_editor))); - - if ui - .add_enabled(open_file_with_path.is_some(), Button::new("Save")) - .clicked() - { - if let Some((file_path, file_editor)) = open_file_with_path { - let text = file_editor.to_string(); - let file_path = file_path.to_owned(); - self.jobs.start(ui, move || { - if let Err(e) = fs::write(file_path, text.as_bytes()) { - log::error!("{e}"); - }; - None - }); - } - } - #[cfg(not(target_arch = "wasm32"))] if ui .add_enabled(open_file.is_some(), Button::new("Save As")) @@ -303,7 +302,7 @@ impl eframe::App for App { let (tab_id, editor) = open_file.expect("We checked that open_file is_some"); let text = editor.to_string(); - self.jobs.start(ui, move || { + self.jobs.start(ui.ctx(), move || { let file_path = rfd::FileDialog::new().save_file()?; fs::write(&file_path, text.as_bytes()) @@ -331,15 +330,12 @@ impl eframe::App for App { ui.add_space(16.0); - ui.add_space(16.0); - ScrollArea::horizontal().show(ui, |ui| { for (i, (tab_id, tab)) in self.tabs.iter().enumerate() { let selected = self.open_tab_index == Some(i); let mut button = Button::new(tab.title()).selected(selected); - let dirty = i == 0; // TODO: mark as dirty when contents hasn't been saved - if dirty { + if tab.is_dirty() { button = button.right_text(RichText::new("*").strong()) } @@ -387,4 +383,31 @@ impl App { self.next_tab_id += 1; self.tabs.insert(i, (id, tab)); } + + fn save_active_tab(&mut self, ctx: &Context) { + let open_file = self + .open_tab_index + .and_then(|i| self.tabs.get_mut(i)) + .and_then(|(id, tab)| match tab { + Tab::File(file_editor) => Some((*id, file_editor)), + }) + .and_then(|(_, file_editor)| { + file_editor + .path() + .map(ToOwned::to_owned) + .zip(Some(file_editor)) + }); + + if let Some((file_path, file_editor)) = open_file { + file_editor.is_dirty = false; + let text = file_editor.to_string(); + let file_path = file_path.to_owned(); + self.jobs.start(ctx, move || { + if let Err(e) = fs::write(file_path, text.as_bytes()) { + log::error!("{e}"); + }; + None + }); + } + } } diff --git a/src/file_editor.rs b/src/file_editor.rs index 8469c8b..d19eb70 100644 --- a/src/file_editor.rs +++ b/src/file_editor.rs @@ -22,6 +22,9 @@ pub struct FileEditor { title: String, pub path: Option, pub buffer: Vec, + + /// Whether the file has been edited since it was laste saved to disk. + pub is_dirty: bool, } #[derive(serde::Deserialize, serde::Serialize)] @@ -37,6 +40,7 @@ impl FileEditor { title: title.into(), path: None, buffer, + is_dirty: false, } } @@ -69,9 +73,11 @@ impl FileEditor { ui.horizontal(|ui| { ui.label("new"); if ui.button("text").clicked() { + self.is_dirty = true; self.buffer.push(BufferItem::Text(Default::default())); } if ui.button("writing").clicked() { + self.is_dirty = true; self.buffer .push(BufferItem::Handwriting(Default::default())); } @@ -138,14 +144,18 @@ impl FileEditor { let item_response = ui.allocate_ui(item_size, |ui| match item { BufferItem::Text(text_edit) => { - text_edit.ui(ui); + if text_edit.ui(ui).changed { + self.is_dirty = true; + } } - BufferItem::Handwriting(painting) => { + BufferItem::Handwriting(handwriting) => { let style = HandwritingStyle { animate: preferences.animations, ..HandwritingStyle::from_theme(ui.ctx().theme()) }; - painting.ui(&style, ui); + if handwriting.ui(&style, ui).changed { + self.is_dirty = true; + } } }); @@ -211,10 +221,12 @@ impl FileEditor { Ordering::Greater => { let item = self.buffer.remove(from); self.buffer.insert(to, item); + self.is_dirty = true; } Ordering::Less => { let item = self.buffer.remove(from); self.buffer.insert(to - 1, item); + self.is_dirty = true; } Ordering::Equal => {} } diff --git a/src/painting.rs b/src/painting.rs index 83ea913..1ce4b32 100644 --- a/src/painting.rs +++ b/src/painting.rs @@ -94,6 +94,10 @@ pub struct Handwriting { last_mesh_ctx: Option, } +pub struct HandwritingResponse { + pub changed: bool, +} + /// Context of a mesh render. #[derive(Clone, Copy, PartialEq)] struct MeshContext { @@ -164,6 +168,7 @@ impl Handwriting { &mut self, style: Option<&mut HandwritingStyle>, ui: &mut egui::Ui, + response: &mut HandwritingResponse, ) -> egui::Response { ui.horizontal(|ui| { if let Some(style) = style { @@ -175,12 +180,14 @@ impl Handwriting { if ui.button("Clear Painting").clicked() { self.strokes.clear(); self.refresh_texture = true; + response.changed = true; } ui.add_enabled_ui(!self.strokes.is_empty(), |ui| { if ui.button("Undo").clicked() { self.strokes.pop(); self.refresh_texture = true; + response.changed = true; } }); @@ -190,12 +197,18 @@ impl Handwriting { .response } - fn commit_current_line(&mut self) { + fn commit_current_line(&mut self, response: &mut HandwritingResponse) { debug_assert!(!self.current_stroke.is_empty()); self.strokes.push(mem::take(&mut self.current_stroke)); + response.changed = true; } - pub fn ui_content(&mut self, style: &HandwritingStyle, ui: &mut Ui) -> egui::Response { + pub fn ui_content( + &mut self, + style: &HandwritingStyle, + ui: &mut Ui, + hw_response: &mut HandwritingResponse, + ) -> egui::Response { if style.animate { self.height = ui.ctx().animate_value_with_time( self.id.with("height animation"), @@ -216,11 +229,8 @@ impl Handwriting { let size = response.rect.size(); - let to_screen = emath::RectTransform::from_to( - //Rect::from_min_size(Pos2::ZERO, response.rect.square_proportions()), - Rect::from_min_size(Pos2::ZERO, size), - response.rect, - ); + let to_screen = + emath::RectTransform::from_to(Rect::from_min_size(Pos2::ZERO, size), response.rect); let from_screen = to_screen.inverse(); let is_drawing = response.interact_pointer_pos().is_some(); @@ -229,7 +239,7 @@ impl Handwriting { if !is_drawing { // commit current line if was_drawing { - self.commit_current_line(); + self.commit_current_line(hw_response); response.mark_changed(); } @@ -324,7 +334,7 @@ impl Handwriting { (PointerButton::Primary, false) => { if last_canvas_pos.is_some() { self.push_to_stroke(from_screen * pos); - self.commit_current_line(); + self.commit_current_line(hw_response); response.mark_changed(); } @@ -341,7 +351,7 @@ impl Handwriting { // in the same frame. Should handle this. Event::PointerGone | Event::WindowFocused(false) => { if !self.current_stroke.is_empty() { - self.commit_current_line(); + self.commit_current_line(hw_response); break; } } @@ -475,9 +485,11 @@ impl Handwriting { } } - pub fn ui(&mut self, style: &HandwritingStyle, ui: &mut Ui) { + pub fn ui(&mut self, style: &HandwritingStyle, ui: &mut Ui) -> HandwritingResponse { + let mut response = HandwritingResponse { changed: false }; + ui.vertical_centered_justified(|ui| { - self.ui_control(None, ui); + self.ui_control(None, ui, &mut response); //ui.label("Paint with your mouse/touch!"); Frame::canvas(ui.style()) @@ -485,9 +497,11 @@ impl Handwriting { .stroke(Stroke::new(5.0, Color32::from_black_alpha(40))) .fill(style.bg_color) .show(ui, |ui| { - self.ui_content(style, ui); + self.ui_content(style, ui, &mut response); }); }); + + response } fn push_to_stroke(&mut self, new_canvas_pos: Pos2) { diff --git a/src/text_editor.rs b/src/text_editor.rs index 09ebd47..aaf52e8 100644 --- a/src/text_editor.rs +++ b/src/text_editor.rs @@ -24,6 +24,10 @@ pub struct MdTextEdit { cursor: Option, } +pub struct MdTextEditOutput { + pub changed: bool, +} + impl MdTextEdit { pub fn new() -> Self { MdTextEdit::default() @@ -36,7 +40,7 @@ impl MdTextEdit { } } - pub fn ui(&mut self, ui: &mut Ui) { + pub fn ui(&mut self, ui: &mut Ui) -> MdTextEditOutput { let Self { text, highlighter, @@ -72,6 +76,10 @@ impl MdTextEdit { *cursor = text_edit.cursor_range; //ui.ctx().request_repaint(); } + + MdTextEditOutput { + changed: text_edit.response.changed(), + } } }