feat: make show hidden togglable

Byson94 · Byson94 · commit f2d6f2dcf18c · 2025-10-18T21:37:42.000+05:30
diff --git a/src/files_panel.rs b/src/files_panel.rs
@@ -162,9 +162,11 @@ pub fn build_files_panel(fmstate: Rc<RefCell<FmState>>) -> (ScrolledWindow, Stri
                                 ) {
                                     Ok(_) => {
                                         if let Some(files_list) = &files_list {
+                                            let fmstate_ref = fmstate.borrow();
                                             populate_files_list(
                                                 files_list,
-                                                Path::new(&fmstate.borrow().current_path),
+                                                Path::new(&fmstate_ref.current_path),
+                                                &fmstate_ref.settings.show_hidden,
                                             );
                                         }
                                     }
@@ -199,12 +201,23 @@ pub fn build_files_panel(fmstate: Rc<RefCell<FmState>>) -> (ScrolledWindow, Stri
     (scroll, files_list, list_view)
 }
 
-pub fn populate_files_list(files_list: &gtk4::StringList, path: &std::path::Path) {
+pub fn populate_files_list(
+    files_list: &gtk4::StringList,
+    path: &std::path::Path,
+    show_hidden: &bool,
+) {
     while files_list.n_items() > 0 {
         files_list.remove(0);
     }
     if let Ok(entries) = std::fs::read_dir(path) {
         for entry in entries.flatten() {
+            let file_name = entry.file_name();
+            let file_name_str = file_name.to_string_lossy();
+
+            if !show_hidden && file_name_str.starts_with('.') {
+                continue;
+            }
+
             files_list.append(&entry.path().to_string_lossy());
         }
     }
diff --git a/src/headerbar.rs b/src/headerbar.rs
@@ -4,10 +4,17 @@ use gtk4::{Box as GtkBox, MenuButton};
 
 pub fn build_headerbar() -> GtkBox {
     let headerbar = GtkBox::new(gtk4::Orientation::Horizontal, 6);
+
+    // Main menu
     let menu = Menu::new();
     menu.append(Some("File"), Some("app.file"));
     menu.append(Some("Edit"), Some("app.edit"));
-    menu.append(Some("View"), Some("app.view"));
+
+    // "View" submenu
+    let view_submenu = Menu::new();
+    view_submenu.append(Some("Show Hidden Files"), Some("win.show_hidden"));
+
+    menu.append_submenu(Some("View"), &view_submenu);
 
     let menu_button = MenuButton::new();
     menu_button.set_menu_model(Some(&menu));
diff --git a/src/main.rs b/src/main.rs
@@ -13,6 +13,7 @@ use gtk4::{Application, ApplicationWindow, Box as GtkBox, GestureClick, Orientat
 use std::cell::RefCell;
 use std::path::PathBuf;
 use std::rc::Rc;
+use gtk4::gio::SimpleAction;
 
 const APP_ID: &str = "org.filemanager.axfm";
 
@@ -38,6 +39,17 @@ fn build_fm(app: &Application) {
     let home_path = dirs::home_dir().unwrap_or(PathBuf::from("/")).join("");
     let fmstate = Rc::new(RefCell::new(state::FmState::new(home_path.clone())));
 
+    // TODO: Move it to its own module
+    let initial = fmstate.borrow().settings.show_hidden;
+    let show_hidden_action = SimpleAction::new_stateful("show_hidden", None, &initial.into());
+
+    show_hidden_action.connect_activate(glib::clone!(#[strong] fmstate, move |action, _| {
+        let current: bool = action.state().unwrap().get().unwrap();
+        action.set_state(&(!current).into());
+        fmstate.borrow_mut().settings.show_hidden = !current;
+    }));
+    window.add_action(&show_hidden_action);
+
     let (files_scroll, files_list, list_view) = files_panel::build_files_panel(fmstate.clone());
     let (sidebar_box, sidebar_selection) = sidebar::build_sidebar(fmstate.clone(), &files_list);
     let path_bar = pathbar::build_pathbar(&mut fmstate.borrow_mut());
@@ -47,7 +59,11 @@ fn build_fm(app: &Application) {
     let file_area_menu =
         popup_menu::get_file_right_click(&content_area, fmstate.clone(), &files_list);
 
-    files_panel::populate_files_list(&files_list, &home_path);
+    files_panel::populate_files_list(
+        &files_list,
+        &home_path,
+        &fmstate.borrow().settings.show_hidden,
+    );
 
     sidebar_selection.connect_selected_notify(glib::clone!(
         #[weak]
@@ -71,15 +87,13 @@ fn build_fm(app: &Application) {
             ];
 
             if let Some(path) = paths.get(idx as usize) {
-                while files_list.n_items() > 0 {
-                    files_list.remove(0);
-                }
-                if let Ok(entries) = std::fs::read_dir(path) {
-                    for entry in entries.flatten() {
-                        files_list.append(&entry.path().to_string_lossy());
-                    }
-                }
-                fmstate.borrow_mut().set_path(path.clone());
+                let mut fmstate_mut = fmstate.borrow_mut();
+                files_panel::populate_files_list(
+                    &files_list,
+                    &path,
+                    &fmstate_mut.settings.show_hidden,
+                );
+                fmstate_mut.set_path(path.clone());
             }
         }
     ));
@@ -89,19 +103,17 @@ fn build_fm(app: &Application) {
         files_list,
         #[weak]
         sidebar_selection,
+        #[strong]
+        fmstate,
         move |widget| {
             let path = PathBuf::from(widget.text());
-            if let Ok(entries) = std::fs::read_dir(path) {
-                while files_list.n_items() > 0 {
-                    files_list.remove(0);
-                }
+            files_panel::populate_files_list(
+                &files_list,
+                &path,
+                &fmstate.borrow().settings.show_hidden,
+            );
 
-                for entry in entries.flatten() {
-                    files_list.append(&entry.path().to_string_lossy());
-                }
-
-                sidebar_selection.unselect_all();
-            }
+            sidebar_selection.unselect_all();
         }
     ));
 
@@ -118,7 +130,11 @@ fn build_fm(app: &Application) {
                     obj.downcast::<gtk4::StringObject>().unwrap().string(),
                 );
                 if path.is_dir() {
-                    files_panel::populate_files_list(&files_list, &path);
+                    files_panel::populate_files_list(
+                        &files_list,
+                        &path,
+                        &fmstate.borrow().settings.show_hidden,
+                    );
                     fmstate.borrow_mut().set_path(path.join(""));
                     sidebar_selection.unselect_all();
                 }
diff --git a/src/popup_menu.rs b/src/popup_menu.rs
@@ -102,9 +102,11 @@ pub fn get_file_right_click(
                         let file = gio::File::for_path(path);
                         match file.trash(None::<&gio::Cancellable>) {
                             Ok(_) => {
+                                let fmstate_ref = fmstate.borrow();
                                 crate::files_panel::populate_files_list(
                                     &files_list,
-                                    Path::new(&fmstate.borrow().current_path),
+                                    Path::new(&fmstate_ref.current_path),
+                                    &fmstate_ref.settings.show_hidden,
                                 );
                             }
                             Err(e) => eprintln!("Error while moving to trash: {}", e),
diff --git a/src/sidebar.rs b/src/sidebar.rs
@@ -81,9 +81,11 @@ pub fn build_sidebar(
                                 ) {
                                     Ok(_) => {
                                         if let Some(files_list) = &files_list {
+                                            let fmstate_ref = fmstate.borrow();
                                             crate::files_panel::populate_files_list(
                                                 files_list,
-                                                Path::new(&fmstate.borrow().current_path),
+                                                Path::new(&fmstate_ref.current_path),
+                                                &fmstate_ref.settings.show_hidden,
                                             );
                                         }
                                     }
diff --git a/src/state.rs b/src/state.rs
@@ -1,9 +1,11 @@
+use crate::utils::FMSettings;
 use gtk4::glib::GString;
 use std::path::PathBuf;
 
 pub struct FmState {
     pub current_path: PathBuf,
     pub on_path_changed: Vec<Box<dyn Fn(&PathBuf)>>,
+    pub settings: FMSettings,
     pub hovered_file: Option<GString>,
     pub popup_focused_file: Option<GString>,
 }
@@ -13,6 +15,7 @@ impl FmState {
         Self {
             current_path,
             on_path_changed: Vec::new(),
+            settings: FMSettings::new(),
             hovered_file: None,
             popup_focused_file: None,
         }
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
@@ -1,3 +1,5 @@
+mod settings;
 mod widget_data;
 
+pub use settings::*;
 pub use widget_data::*;
diff --git a/src/utils/settings.rs b/src/utils/settings.rs
@@ -0,0 +1,11 @@
+pub struct FMSettings {
+    pub show_hidden: bool,
+}
+
+impl FMSettings {
+    pub fn new() -> Self {
+        Self {
+            show_hidden: false,
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -81,9 +81,11 @@ pub fn build_sidebar(`
`81`	`81`	`) {`
`82`	`82`	`Ok(_) => {`
`83`	`83`	`if let Some(files_list) = &files_list {`
	`84`	`+ let fmstate_ref = fmstate.borrow();`
`84`	`85`	`crate::files_panel::populate_files_list(`
`85`	`86`	`files_list,`
`86`		`- Path::new(&fmstate.borrow().current_path),`
	`87`	`+ Path::new(&fmstate_ref.current_path),`
	`88`	`+ &fmstate_ref.settings.show_hidden,`
`87`	`89`	`);`
`88`	`90`	`}`
`89`	`91`	`}`