Prepare for handling mutable application state

Byron · Jun 3, 2019 · e48898b · e48898b
1 parent e8cb9dc
commit e48898b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/src/interactive/app.rs b/src/interactive/app.rs
@@ -1,3 +1,4 @@
+use super::widgets::{DisplayState, MainWindow};
 use crate::{interactive::Traversal, ByteFormat, WalkOptions, WalkResult};
 use failure::Error;
 use std::{io, path::PathBuf};
@@ -31,9 +32,14 @@ impl TerminalApp {
         let Self { traversal, display } = self;
         terminal.draw(|mut f| {
             let full_screen = f.size();
-            super::widgets::MainWindow {
+            let root = traversal.root_index;
+            MainWindow {
                 traversal,
                 display: *display,
+                state: DisplayState {
+                    root,
+                    selected: None,
+                },
             }
             .render(&mut f, full_screen)
         })?;
@@ -77,9 +83,13 @@ impl TerminalApp {
             traversal: Traversal::from_walk(options, input, move |traversal| {
                 terminal.draw(|mut f| {
                     let full_screen = f.size();
-                    super::widgets::MainWindow {
+                    MainWindow {
                         traversal,
                         display: display_options,
+                        state: DisplayState {
+                            root: traversal.root_index,
+                            selected: None,
+                        },
                     }
                     .render(&mut f, full_screen)
                 })?;

diff --git a/src/interactive/widgets.rs b/src/interactive/widgets.rs
@@ -15,9 +15,15 @@ pub struct Entries<'a> {
     pub display: DisplayOptions,
 }
 
+pub struct DisplayState {
+    pub root: TreeIndex,
+    pub selected: Option<TreeIndex>,
+}
+
 pub struct MainWindow<'a> {
     pub traversal: &'a Traversal,
     pub display: DisplayOptions,
+    pub state: DisplayState,
 }
 
 pub struct Footer {
@@ -59,22 +65,22 @@ impl<'a> Widget for MainWindow<'a> {
             traversal:
                 Traversal {
                     tree,
-                    root_index,
                     entries_traversed,
                     total_bytes,
                     ..
                 },
             display,
-        } = *self;
+            state,
+        } = self;
         let regions = Layout::default()
             .direction(Direction::Vertical)
             .constraints([Constraint::Max(256), Constraint::Length(1)].as_ref())
             .split(area);
         let (entries, footer) = (regions[0], regions[1]);
         Entries {
             tree: &tree,
-            root: *root_index,
-            display: display,
+            root: state.root,
+            display: *display,
         }
         .draw(entries, buf);