Merge pull request #789 from multiplex55/tagandnote

Tagandnote

Author: multiplex55

src/gui/mod.rs

@@ -120,6 +120,7 @@ const SUBCOMMANDS: &[&str] = &[
 
 /// Prefix used to search user saved applications.
 pub const APP_PREFIX: &str = "app";
+const NOTE_SEARCH_DEBOUNCE: Duration = Duration::from_secs(1);
 
 fn scale_ui<R>(ui: &mut egui::Ui, scale: f32, add_contents: impl FnOnce(&mut egui::Ui) -> R) -> R {
     ui.scope(|ui| {
@@ -518,6 +519,7 @@ pub struct LauncherApp {
     last_results_valid: bool,
     last_timer_query: bool,
     last_stopwatch_query: bool,
+    last_note_search_change: Option<Instant>,
     pending_query: Option<String>,
     confirm_modal: ConfirmationModal,
     pending_confirm: Option<PendingConfirmAction>,
@@ -714,6 +716,39 @@ impl LauncherApp {
         }
     }
 
+    fn is_note_search_query(query: &str) -> bool {
+        query
+            .trim_start()
+            .to_lowercase()
+            .starts_with("note search")
+    }
+
+    fn note_search_debounce_ready(
+        last_change: Option<Instant>,
+        now: Instant,
+        debounce: Duration,
+    ) -> bool {
+        last_change
+            .map(|changed_at| now.duration_since(changed_at) >= debounce)
+            .unwrap_or(false)
+    }
+
+    fn maybe_run_note_search_debounce(&mut self) {
+        if !Self::is_note_search_query(&self.query) {
+            self.last_note_search_change = None;
+            return;
+        }
+
+        if Self::note_search_debounce_ready(
+            self.last_note_search_change,
+            Instant::now(),
+            NOTE_SEARCH_DEBOUNCE,
+        ) {
+            self.search();
+            self.last_note_search_change = None;
+        }
+    }
+
     pub fn plugin_enabled(&self, name: &str) -> bool {
         match &self.enabled_plugins {
             Some(set) => set.contains(name),
@@ -1315,6 +1350,7 @@ impl LauncherApp {
             last_results_valid: false,
             last_timer_query: false,
             last_stopwatch_query: false,
+            last_note_search_change: None,
             pending_query: None,
             confirm_modal: ConfirmationModal::default(),
             pending_confirm: None,
@@ -3477,6 +3513,7 @@ impl eframe::App for LauncherApp {
             self.search();
             self.focus_input();
         }
+        self.maybe_run_note_search_debounce();
         if let (Some(t), Some(_)) = (self.error_time, self.error.as_ref()) {
             if t.elapsed().as_secs_f32() >= 3.0 {
                 self.error = None;
@@ -3690,7 +3727,12 @@ impl eframe::App for LauncherApp {
 
                 if input.changed() {
                     self.autocomplete_index = 0;
-                    self.search();
+                    if Self::is_note_search_query(&self.query) {
+                        self.last_note_search_change = Some(Instant::now());
+                    } else {
+                        self.last_note_search_change = None;
+                        self.search();
+                    }
                 }
 
                 if self.query_autocomplete && !use_dashboard && !self.suggestions.is_empty() {
@@ -4854,6 +4896,7 @@ mod tests {
         Arc, Mutex,
     };
     use tempfile::tempdir;
+    use std::time::{Duration, Instant};
 
     static TEST_MUTEX: Lazy<Mutex<()>> = Lazy::new(|| Mutex::new(()));
 
@@ -5148,4 +5191,24 @@ mod tests {
 
         std::env::set_current_dir(orig_dir).unwrap();
     }
+
+    #[test]
+    fn note_search_debounce_respects_delay() {
+        let start = Instant::now();
+        assert!(!LauncherApp::note_search_debounce_ready(
+            Some(start),
+            start,
+            NOTE_SEARCH_DEBOUNCE,
+        ));
+        assert!(!LauncherApp::note_search_debounce_ready(
+            Some(start),
+            start + Duration::from_millis(999),
+            NOTE_SEARCH_DEBOUNCE,
+        ));
+        assert!(LauncherApp::note_search_debounce_ready(
+            Some(start),
+            start + NOTE_SEARCH_DEBOUNCE,
+            NOTE_SEARCH_DEBOUNCE,
+        ));
+    }
 }

src/gui/todo_view_dialog.rs

@@ -89,7 +89,9 @@ impl TodoViewDialog {
                         .sort_by(|a, b| self.entries[*b].priority.cmp(&self.entries[*a].priority));
                 }
                 let area_height = ui.available_height();
+                // Keep horizontal overflow for long todo text without wrapping.
                 egui::ScrollArea::both()
+                    .auto_shrink([false, false])
                     .max_height(area_height)
                     .show(ui, |ui| {
                         for idx in indices {
@@ -134,13 +136,15 @@ impl TodoViewDialog {
                                 });
                             } else {
                                 let entry = &mut self.entries[idx];
-                                ui.horizontal_wrapped(|ui| {
+                                ui.horizontal(|ui| {
                                     if ui.checkbox(&mut entry.done, "").changed() {
                                         save_now = true;
                                     }
-                                    let resp = ui.label(entry.text.replace('\n', " "));
+                                    let resp = ui.add(
+                                        egui::Label::new(entry.text.replace('\n', " ")).wrap(false),
+                                    );
                                     let idx_copy = idx;
-                                    resp.clone().context_menu(|ui| {
+                                    resp.clone().context_menu(|ui: &mut egui::Ui| {
                                         if ui.button("Edit Todo").clicked() {
                                             self.editing_idx = Some(idx_copy);
                                             self.editing_text = entry.text.clone();
@@ -149,15 +153,18 @@ impl TodoViewDialog {
                                             ui.close_menu();
                                         }
                                     });
-                                    ui.label(format!("p{}", entry.priority));
+                                    ui.add(
+                                        egui::Label::new(format!("p{}", entry.priority))
+                                            .wrap(false),
+                                    );
                                     if !entry.tags.is_empty() {
-                                        ui.label(format!("#{:?}", entry.tags.join(", ")));
-                                    }
-                                    if ui.button("Edit").clicked() {
-                                        self.editing_idx = Some(idx);
-                                        self.editing_text = entry.text.clone();
-                                        self.editing_priority = entry.priority;
-                                        self.editing_tags = entry.tags.join(", ");
+                                        ui.add(
+                                            egui::Label::new(format!(
+                                                "#{:?}",
+                                                entry.tags.join(", ")
+                                            ))
+                                            .wrap(false),
+                                        );
                                     }
                                 });
                             }