support search even no file opens

Author: zsqw123

asm_egui/src/file_tab.rs

@@ -54,7 +54,7 @@ fn file_title(
         }
     } else if response.raw.clicked() {
         *selected_tab_index = Some(index);
-        top.file_path = Some(title_cloned.to_string());
+        top.file_path = title_cloned.to_string();
     }
 }
 

asm_egui/src/file_tree.rs

@@ -1,17 +1,33 @@
 use crate::app::EguiApp;
 use egui::text::LayoutJob;
 use egui::{ScrollArea, TextStyle};
+use java_asm::StrRef;
 use java_asm_server::ui::{AppContainer, FileEntry, FileInfo, OpenFileMessage, RawDirInfo, UIMessage};
 
 pub fn render_dir(ui: &mut egui::Ui, app: &mut EguiApp) {
     let server_app = &app.ui_app;
     let mut left = server_app.left().lock();
-    let entries = &mut left.root_node.visible_items();
+    let offset_key = left.offset_key.clone();
+    let hint_key = left.hint_key.clone();
+    left.offset_key = None; // set to none to avoid ui can't scrolling.
+    let file_tree = &mut left.root_node.visible_items(offset_key);
+    let required_file_index = file_tree.required_file_index;
+    let entries = &mut file_tree.entries;
     let server = app.server.lock();
     if server.is_none() { return; }
     let row_height = ui.spacing().interact_size.y;
-    let scroll_area = ScrollArea::vertical().auto_shrink(false);
-    // scroll_area.vertical_scroll_offset();
+    let mut scroll_area = ScrollArea::vertical().auto_shrink(false);
+
+    if required_file_index > 0 {
+        // scroll to the required file
+        let required_file_index = required_file_index as f32;
+        let row_height_with_spacing = row_height + ui.spacing().item_spacing.y;
+        let scroll_offset = row_height_with_spacing * required_file_index;
+        let window_rect = ui.input(|i: &egui::InputState| i.screen_rect());
+        let window_height: f32 = window_rect.max[1] - window_rect.min[1];
+        scroll_area = scroll_area.vertical_scroll_offset(scroll_offset - window_height * 0.2);
+    }
+
     scroll_area.show_rows(ui, row_height, entries.len(), |ui, range| {
         for i in range {
             let entry = &mut entries[i];
@@ -20,21 +36,27 @@ pub fn render_dir(ui: &mut egui::Ui, app: &mut EguiApp) {
                     render_dir_raw(ui, raw_dir, server_app);
                 }
                 FileEntry::File(file_info) => {
-                    render_file(ui, file_info, server_app);
+                    render_file(ui, file_info, server_app, &hint_key);
                 }
             }
         }
     });
 }
 
 fn render_file(
-    ui: &mut egui::Ui, file_info: &mut FileInfo, app: &AppContainer,
+    ui: &mut egui::Ui, file_info: &mut FileInfo, app: &AppContainer, hint: &Option<StrRef>,
 ) {
     let FileInfo { title, file_key, level } = file_info;
     ui.horizontal(|ui| {
         ui.add_space((*level as f32) * 12.0);
         let layout_job = layout_string(ui, title.to_string());
-        let label = ui.selectable_label(false, layout_job);
+        let checked: bool;
+        if let Some(hint) = hint {
+            checked = hint == file_key;
+        } else {
+            checked = false;
+        }
+        let label = ui.selectable_label(checked, layout_job);
         if label.clicked() {
             let message = UIMessage::OpenFile(
                 OpenFileMessage {
@@ -66,7 +88,8 @@ fn render_dir_raw(
             if new_opened {
                 *opened = true;
             } else {
-                // closed, close all child dir
+                // need to close all child dir
+                // so we passed a message to server
                 app_container.send_message(UIMessage::CloseDir(dir_info.dir_key.clone()))
             }
         }

asm_egui/src/top_bar.rs

@@ -40,9 +40,9 @@ impl EguiApp {
 
     fn file_path_input(&mut self, ui: &mut Ui) {
         let mut locked_top = self.ui_app.top().lock();
-        let Some(file_path) = &mut locked_top.file_path else { return; };
+        let mut file_path = &mut locked_top.file_path;
 
-        let edit_path_ui = Self::file_path_input_area(ui, file_path);
+        let edit_path_ui = Self::file_path_input_area(ui, &mut file_path);
 
         let popup_id = Id::new("file_path_popup");
         if edit_path_ui.gained_focus() {
@@ -80,6 +80,7 @@ impl EguiApp {
         let target_width_for_content = max_width - last_time_remaining;
 
         let edit_path_ui = TextEdit::singleline(file_path)
+            .hint_text("Enter class name to search...")
             .desired_width(target_width_for_content).show(ui).response;
 
         let remaining_width = ui.min_rect().width() - target_width_for_content;

asm_server/src/impls/server.rs

@@ -2,11 +2,10 @@ use crate::impls::apk_load::read_apk;
 use crate::server::OpenFileError;
 use crate::ui::{AppContainer, DirInfo, Left};
 use crate::{AccessorEnum, AccessorMut, AsmServer, ServerMut};
-use java_asm::StrRef;
 use log::info;
+use rfd::MessageDialogResult::No;
 use std::io::{Read, Seek};
 use std::ops::DerefMut;
-use std::sync::Arc;
 use std::time::Instant;
 use tokio::runtime::Runtime;
 use tokio::sync::mpsc;
@@ -89,6 +88,6 @@ impl AsmServer {
         let start = Instant::now();
         let dir_info = DirInfo::from_classes(&classes);
         info!("resolve dir info cost: {:?}", start.elapsed());
-        app.set_left(Left { root_node: dir_info });
+        app.set_left(Left { root_node: dir_info, offset_key: None, hint_key: None });
     }
 }

asm_server/src/server.rs

@@ -90,6 +90,8 @@ impl AsmServer {
         let accessor_locked = self.accessor.lock();
         let Some(accessor) = accessor_locked.deref() else { return; };
         let mut left = render_target.left().lock();
+        left.offset_key = Some(file_key.into());
+        left.hint_key = Some(file_key.into());
         let mut content = render_target.content().lock();
         let mut top = render_target.top().lock();
         self.switch_or_open_lock_free(file_key, accessor, &mut left, &mut content, &mut top);
@@ -145,7 +147,7 @@ impl AsmServer {
         content.opened_tabs.push(current_tab);
         content.selected = Some(current);
 
-        top.file_path = Some(file_key.to_string());
+        top.file_path = file_key.to_string();
     }
 
     // switch left side file tree to correct place.
@@ -166,7 +168,7 @@ impl AsmServer {
     }
 
     pub fn search(&self, top: &mut Top) {
-        let Some(query) = &top.file_path else { return; };
+        let query = &top.file_path;
         let query: StrRef = query.as_str().into();
         let mut fuzzy_locked = self.get_or_create_fuzzy(query.clone()).lock();
         let Some(fuzzy) = fuzzy_locked.deref_mut() else { return; };

asm_server/src/ui/mod.rs

@@ -73,13 +73,15 @@ impl AppContainer {
 #[derive(Default, Clone, Debug)]
 pub struct Top {
     pub loading_state: LoadingState,
-    pub file_path: Option<String>,
+    pub file_path: String,
     pub search_result: SearchResult,
 }
 
 #[derive(Default, Clone, Debug)]
 pub struct Left {
     pub root_node: DirInfo,
+    pub offset_key: Option<StrRef>,
+    pub hint_key: Option<StrRef>,
 }
 
 #[derive(Clone, Debug)]
@@ -116,14 +118,24 @@ pub struct DirInfo {
     pub files: FileMap,
 }
 
-fn visible_items<'a, 'b>(dir_info: &'b mut DirInfo, container: &'a mut Vec<FileEntry<'b>>) {
+fn visible_items<'a, 'b>(
+    // input
+    dir_info: &'b mut DirInfo, offset_key: &Option<StrRef>,
+    // output
+    container: &'a mut Vec<FileEntry<'b>>, offset: &mut usize,
+) {
     let opened = dir_info.raw.opened;
     container.push(Dir(&mut dir_info.raw));
     if !opened { return; }
     for (_, dir) in dir_info.dirs.iter_mut() {
-        visible_items(dir, container);
+        visible_items(dir, offset_key, container, offset);
     }
     for (_, file) in dir_info.files.iter_mut() {
+        if let Some(file_key) = offset_key {
+            if *file_key == file.file_key {
+                *offset = container.len();
+            }
+        }
         container.push(File(file));
     }
 }
@@ -174,10 +186,14 @@ impl DirInfo {
         }
     }
 
-    pub fn visible_items(&mut self) -> Vec<FileEntry> {
+    pub fn visible_items(&'_ mut self, offset_key: Option<StrRef>) -> FileTreeBuildResult<'_> {
         let mut container = Vec::new();
-        visible_items(self, &mut container);
-        container
+        let mut index_of_offset = 0usize;
+        visible_items(self, &offset_key, &mut container, &mut index_of_offset);
+        FileTreeBuildResult {
+            entries: container,
+            required_file_index: index_of_offset,
+        }
     }
 
     fn entry_parts(path: &str) -> Peekable<Enumerate<Split<char>>> {
@@ -208,6 +224,12 @@ impl DirInfo {
     }
 }
 
+pub struct FileTreeBuildResult<'a> {
+    pub entries: Vec<FileEntry<'a>>,
+    // the index of required file which used for initial scrolling offset.
+    pub required_file_index: usize,
+}
+
 #[derive(Clone, Debug, Default)]
 pub struct Content {
     // the index of the selected tab in opened_tabs.