`e23528e`

app: wire up icon size controls, fix help modal scroll

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 3 months ago

SHA: e23528eb515f77391fc8c812e0a25add3e9051d0
Parents: 63af87c
Tree: 23ea1ae

1 changed file

Status	File	+	-
M	`garfield/src/app.rs`	59	3

garfield/src/app.rsmodified

      trash_files, restore_from_trash,
  };
  use garfield::ui::pane::SplitDirection;
 -use garfield::ui::{AddressBar, AppPickerDialog, AppPickerResult, Breadcrumb, ConfirmDialog, ConflictAction, ConflictDialog, ContextMenu, ContextMenuAction, ContextType, DialogResult, HelpModal, InputDialog, InputResult, Pane, ProgressDialog, Sidebar, StatusBar, TabBar, TabInfo, Toolbar, ToolbarAction, ViewMode, TAB_BAR_HEIGHT, TOOLBAR_HEIGHT};
 +use garfield::ui::{AddressBar, AppPickerDialog, AppPickerResult, Breadcrumb, ConfirmDialog, ConflictAction, ConflictDialog, ContextMenu, ContextMenuAction, ContextType, DialogResult, HelpModal, IconSize, InputDialog, InputResult, Pane, ProgressDialog, Sidebar, StatusBar, TabBar, TabInfo, Toolbar, ToolbarAction, ViewMode, TAB_BAR_HEIGHT, TOOLBAR_HEIGHT};
  use anyhow::Result;
  use gartk_core::{InputEvent, Key, MouseButton, Point, Rect, Theme};
  use gartk_render::{Renderer, TextStyle};
      /// Handle mouse scroll. Returns true if a redraw is needed.
      fn handle_scroll(&mut self, pos: Point, _delta_x: i32, delta_y: i32) -> bool {
 +        // Help modal captures all scroll events when visible
 +        if self.help_modal.is_visible() {
 +            self.help_modal.on_scroll(delta_y);
 +            return true;
 +        }
++
          // Check if scroll is over the content area (not sidebar, toolbar, etc.)
          if let Some(pane) = self.focused_pane_mut() {
              if let Some(tab) = pane.active_tab_mut() {
                      return;
+                 }
                  Key::Char('+') | Key::Char('=') => {
 -                    // Cycle icon size in grid view
 +                    // Increase icon size in grid view
 +                    if let Some(pane) = self.focused_pane_mut() {
 +                        if let Some(tab) = pane.active_tab_mut() {
 +                            tab.increase_icon_size();
 +                        }
 +                    }
 +                    self.sync_toolbar_icon_size();
 +                    return;
 +                }
 +                Key::Char('-') | Key::Char('_') => {
 +                    // Decrease icon size in grid view
                      if let Some(pane) = self.focused_pane_mut() {
                          if let Some(tab) = pane.active_tab_mut() {
 -                            tab.cycle_icon_size();
 +                            tab.decrease_icon_size();
+                         }
+                     }
 +                    self.sync_toolbar_icon_size();
                      return;
+                 }
                  Key::Char('t') | Key::Char('T') => {
          self.sync_tab_bar();
          self.sync_breadcrumb();
 +        self.sync_toolbar_view();
 +        self.sync_toolbar_icon_size();
          self.update_status_bar();
+     }
              self.sync_tab_bar();
              self.sync_breadcrumb();
              self.sync_toolbar_view();
 +            self.sync_toolbar_icon_size();
              self.update_status_bar();
+         }
+     }
              self.focused_pane_id = new_id;
              self.sync_tab_bar();
              self.sync_breadcrumb();
 +            self.sync_toolbar_view();
 +            self.sync_toolbar_icon_size();
              self.update_status_bar();
+         }
+     }
              self.focused_pane_id = new_id;
              self.sync_tab_bar();
              self.sync_breadcrumb();
 +            self.sync_toolbar_view();
 +            self.sync_toolbar_icon_size();
              self.update_status_bar();
+         }
+     }
              self.focused_pane_id = new_id;
              self.sync_tab_bar();
              self.sync_breadcrumb();
 +            self.sync_toolbar_view();
 +            self.sync_toolbar_icon_size();
              self.update_status_bar();
+         }
+     }
              self.focused_pane_id = new_id;
              self.sync_tab_bar();
              self.sync_breadcrumb();
 +            self.sync_toolbar_view();
 +            self.sync_toolbar_icon_size();
              self.update_status_bar();
+         }
+     }
+         }
          self.status_bar.set_view_mode(mode.name());
          self.sync_toolbar_view();
 +        self.sync_toolbar_icon_size();
          self.update_status_bar();
+     }
              ToolbarAction::Paste => self.paste(),
              ToolbarAction::Trash => self.trash_selected(),
              ToolbarAction::NewFolder => self.create_new_folder(),
 +            ToolbarAction::IconSizeSmall => self.set_icon_size(IconSize::Small),
 +            ToolbarAction::IconSizeMedium => self.set_icon_size(IconSize::Medium),
 +            ToolbarAction::IconSizeLarge => self.set_icon_size(IconSize::Large),
 +        }
 +    }
++
 +    /// Set icon size for the active tab's grid view.
 +    fn set_icon_size(&mut self, size: IconSize) {
 +        if let Some(pane) = self.focused_pane_mut() {
 +            if let Some(tab) = pane.active_tab_mut() {
 +                tab.set_icon_size(size);
 +            }
+         }
 +        self.sync_toolbar_icon_size();
+     }
      /// Sync toolbar active view with current tab's view mode.
+         }
+     }
 +    /// Sync toolbar icon size with current tab's grid view icon size.
 +    fn sync_toolbar_icon_size(&mut self) {
 +        if let Some(pane) = self.focused_pane() {
 +            if let Some(tab) = pane.active_tab() {
 +                let action = match tab.icon_size() {
 +                    IconSize::Small => ToolbarAction::IconSizeSmall,
 +                    IconSize::Medium => ToolbarAction::IconSizeMedium,
 +                    IconSize::Large => ToolbarAction::IconSizeLarge,
 +                };
 +                self.toolbar.set_active_icon_size(action);
 +            }
 +        }
 +    }
++
      // === Sync helpers ===
      /// Sync tab bar with focused pane's tabs.