move preview area into PreviewContext

 - move a bunch of methods out into functions

1 files changed, 12 insertions, 5 deletions

diff --git a/src/ui/views/tui_folder_view.rs b/src/ui/views/tui_folder_view.rs
index 2d9538c..4f49ab1 100644
--- a/src/ui/views/tui_folder_view.rs
+++ b/src/ui/views/tui_folder_view.rs
@@ -6,7 +6,7 @@ use ratatui::text::Span;
 use ratatui::widgets::{Block, Borders, Paragraph, Widget, Wrap};
 use ratatui_image::Image;
 
-use crate::context::AppContext;
+use crate::context::{AppContext, PreviewContext, TabContext};
 use crate::preview::preview_dir::PreviewDirState;
 use crate::preview::preview_file::PreviewFileState;
 use crate::ui;
@@ -208,7 +208,11 @@ impl<'a> Widget for TuiFolderView<'a> {
                     if let Some(PreviewFileState::Success(data)) =
                         preview_context.previews_ref().get(entry.file_path())
                     {
-                        let preview_area = calculate_preview(self.context, layout_rect[2]);
+                        let preview_area = calculate_preview(
+                            self.context.tab_context_ref(),
+                            self.context.preview_context_ref(),
+                            layout_rect[2],
+                        );
                         if let Some(preview_area) = preview_area {
                             let area = Rect {
                                 x: preview_area.preview_area.x,
@@ -324,9 +328,12 @@ pub fn calculate_layout_with_borders(area: Rect, constraints: &[Constraint; 3])
     vec![inner1, layout_rect[1], inner3]
 }
 
-pub fn calculate_preview(context: &AppContext, rect: Rect) -> Option<PreviewArea> {
-    let preview_context = context.preview_context_ref();
-    let curr_tab = context.tab_context_ref().curr_tab_ref();
+pub fn calculate_preview(
+    tab_context: &TabContext,
+    preview_context: &PreviewContext,
+    rect: Rect,
+) -> Option<PreviewArea> {
+    let curr_tab = tab_context.curr_tab_ref();
 
     let child_list = curr_tab.child_list_ref();