complete search ui

Author: zsqw123

asm_egui/src/top_bar.rs

@@ -1,6 +1,6 @@
 use crate::app::EguiApp;
 use egui::containers::PopupCloseBehavior;
-use egui::{popup_below_widget, Context, Ui};
+use egui::{popup_below_widget, Context, Id, Response, TextEdit, Ui};
 use java_asm_server::AsmServer;
 use std::ops::Deref;
 
@@ -38,16 +38,23 @@ impl EguiApp {
     fn file_path_input(&mut self, ui: &mut Ui) {
         let mut locked_top = self.server_app.top().lock();
         let Some(file_path) = &mut locked_top.file_path else { return; };
-        let edit_path_ui = ui.text_edit_singleline(file_path);
 
-        let popup_id = ui.make_persistent_id("file_path_popup");
+        let edit_path_ui = Self::file_path_input_area(ui, file_path);
+
+        let popup_id = Id::new("file_path_popup");
         if edit_path_ui.gained_focus() {
             let server_locked = self.server.lock();
             let Some(server) = server_locked.deref() else { return; };
             server.search(&mut locked_top);
             ui.memory_mut(|m| m.open_popup(popup_id));
         }
 
+        if edit_path_ui.changed() {
+            let server_locked = self.server.lock();
+            let Some(server) = server_locked.deref() else { return; };
+            server.search(&mut locked_top);
+        }
+
         let search_results = locked_top.search_result.clone();
         drop(locked_top);
 
@@ -56,20 +63,38 @@ impl EguiApp {
             ui, popup_id, &edit_path_ui,
             PopupCloseBehavior::CloseOnClickOutside, |ui| {
                 ui.vertical(|ui| {
-                    for result in search_results {
-                        if ui.label(result.to_string()).clicked() {
-                            let server_locked = self.server.lock();
-                            let Some(server) = server_locked.deref() else { return; };
-                            let mut content_locked = self.server_app.content().lock();
-                            let mut locked_top = self.server_app.top().lock();
-                            let accessor = server.accessor.lock();
-                            let Some(accessor) = accessor.deref() else { return; };
-                            server.switch_or_open_lock_free(
-                                &result, accessor, &mut content_locked, &mut locked_top,
-                            );
-                        }
-                    }
+                    Self::popup_file_path_ui(self, ui);
                 })
             });
     }
+
+    fn file_path_input_area(ui: &mut Ui, file_path: &mut String) -> Response {
+        let id_for_input_remaining = Id::new("file_path_input_area_remaining");
+        let max_width = ui.max_rect().width();
+        let last_time_remaining = ui
+            .data(|data| data.get_temp(id_for_input_remaining)
+                .unwrap_or(max_width));
+        let target_width_for_content = max_width - last_time_remaining;
+
+        let edit_path_ui = TextEdit::singleline(file_path)
+            .desired_width(target_width_for_content).show(ui).response;
+
+        let remaining_width = ui.min_rect().width() - target_width_for_content;
+        ui.data_mut(|data| {
+            data.insert_temp(id_for_input_remaining, remaining_width);
+        });
+        edit_path_ui
+    }
+
+    fn popup_file_path_ui(&mut self, ui: &mut Ui) {
+        let search_results = self.server_app.top().lock().search_result.clone();
+        for result in search_results {
+            let selectable_label = ui.selectable_label(false, result.to_string());
+            if selectable_label.clicked() {
+                let server_locked = self.server.lock();
+                let Some(server) = server_locked.deref() else { return; };
+                server.switch_or_open(&result, &self.server_app);
+            }
+        }
+    }
 }

asm_egui/src/util.rs

@@ -1,6 +1,36 @@
-use egui::{RichText, WidgetText};
-use java_asm::StrRef;
+use egui::{Id, Ui};
 
-pub fn widget_text(str_ref: StrRef) -> WidgetText {
-    WidgetText::RichText(RichText::new(&*str_ref))
+// content: (ui, target_width_for_content)
+pub fn fill_width_in_parent(
+    ui: &mut Ui, content_id_for_fill: Id, content: impl FnOnce(&mut Ui, f32),
+) {
+    let before_ui_available = ui.available_width();
+    let last_time_allocated = ui
+        .data(|data| data.get_temp(content_id_for_fill)
+            .unwrap_or(before_ui_available));
+    let target_width_for_content = before_ui_available - last_time_allocated;
+    content(ui, target_width_for_content);
+
+    let after_ui_available = ui.available_width();
+    ui.data_mut(|data| {
+        let allocated = before_ui_available - after_ui_available;
+        data.insert_temp(content_id_for_fill, allocated);
+    })
+}
+
+pub fn available_width_to_fill(ui: &mut Ui, content_id_for_fill: Id) -> f32 {
+    let before_ui_available = ui.available_width();
+    let last_time_allocated = ui
+        .data(|data| data.get_temp(content_id_for_fill)
+            .unwrap_or(before_ui_available));
+    before_ui_available - last_time_allocated
+}
+
+pub fn record_remain_width_after_rendered(ui: &mut Ui, content_id_for_fill: Id) {
+    let before_ui_available = ui.available_width();
+    let after_ui_available = ui.available_width();
+    let allocated = before_ui_available - after_ui_available;
+    ui.data_mut(|data| {
+        data.insert_temp(content_id_for_fill, allocated);
+    })
 }

asm_server/src/impls/server.rs

@@ -24,6 +24,8 @@ pub struct ProgressMessage {
     pub in_loading: bool,
 }
 
+// search is too fast now, it's meaningless to use the message to dispatch.
+// so we didn't use this message currently.
 pub struct SearchResultMessage {
     pub result: Vec<StrRef>,
 }

asm_server/src/server.rs

@@ -39,6 +39,7 @@ impl AsmServer {
     pub fn get_trie(&self) -> &ArcNullable<Trie<u8>> {
         let mut current = self.trie.lock();
         if current.is_some() { return &self.trie; }
+        let load_start = Instant::now();
         let classes_locked = self.get_classes().lock();
         let Some(classes) = classes_locked.deref() else { return &self.trie; };
         let mut trie_builder = TrieBuilder::new();
@@ -47,6 +48,11 @@ impl AsmServer {
         };
         let trie = trie_builder.build();
         current.replace(trie);
+        let load_end = Instant::now();
+        info!(
+            "trie loaded in {}ms",
+            load_end.duration_since(load_start).as_millis()
+        );
         &self.trie
     }
 
@@ -122,7 +128,7 @@ impl AsmServer {
         let Some(query) = &top.file_path else { return; };
         let trie_locked = self.get_trie().lock();
         let Some(trie) = trie_locked.deref() else { return; };
-        let results: Vec<String> = trie.predictive_search(query).collect();
+        let results: Vec<String> = trie.predictive_search(query).take(20).collect();
         top.search_result = results.into_iter().map(StrRef::from).collect();
     }
 }