Cycle through graph and bar options

Sebastian Thiel · Sebastian Thiel · commit b0ea97f6afa6 · 2019-06-04T21:54:04.000+05:30
diff --git a/src/interactive/app.rs b/src/interactive/app.rs
@@ -52,6 +52,13 @@ impl Default for ByteVisualization {
 }
 
 impl ByteVisualization {
+    pub fn cycle(&mut self) {
+        use ByteVisualization::*;
+        *self = match self {
+            Bars => Percentage,
+            Percentage => Bars,
+        }
+    }
     pub fn display(&self, percentage: f64, length: usize) -> DisplayByteVisualization {
         DisplayByteVisualization {
             format: *self,
@@ -187,11 +194,7 @@ impl TerminalApp {
             match key {
                 Char('?') => self.toggle_help_pane(),
                 Char('\t') => {
-                    self.state.focussed = match (self.state.focussed, self.state.help_pane) {
-                        (Main, Some(_)) => Help,
-                        (Help, _) => Main,
-                        _ => Main,
-                    };
+                    self.cycle_focus();
                 }
                 Ctrl('c') => break,
                 Char('q') => match self.state.focussed {
@@ -221,6 +224,7 @@ impl TerminalApp {
                     Char('j') => self.change_entry_selection(CursorDirection::Down),
                     Ctrl('d') => self.change_entry_selection(CursorDirection::PageDown),
                     Char('s') => self.state.sorting.toggle_size(),
+                    Char('g') => self.display.byte_vis.cycle(),
                     _ => {}
                 },
             };
@@ -231,6 +235,15 @@ impl TerminalApp {
         })
     }
 
+    fn cycle_focus(&mut self) {
+        use FocussedPane::*;
+        self.state.focussed = match (self.state.focussed, self.state.help_pane) {
+            (Main, Some(_)) => Help,
+            (Help, _) => Main,
+            _ => Main,
+        };
+    }
+
     fn toggle_help_pane(&mut self) {
         use FocussedPane::*;
         self.state.focussed = match self.state.focussed {
diff --git a/src/interactive/widgets/help.rs b/src/interactive/widgets/help.rs
@@ -72,9 +72,10 @@ impl Widget for HelpPane {
                 hotkey("Ctrl + u", "move up 10 entries at once");
                 spacer();
             }
-            title("Keys for sorting");
+            title("Keys for display");
             {
                 hotkey("s", "toggle sort by size ascending/descending");
+                hotkey("g", "cycle through percentage display options");
                 spacer();
             }
             title("Keys for entry operations");

Original file line number	Diff line number	Diff line change
`@@ -72,9 +72,10 @@ impl Widget for HelpPane {`
`72`	`72`	`hotkey("Ctrl + u", "move up 10 entries at once");`
`73`	`73`	`spacer();`
`74`	`74`	`}`
`75`		`- title("Keys for sorting");`
	`75`	`+ title("Keys for display");`
`76`	`76`	`{`
`77`	`77`	`hotkey("s", "toggle sort by size ascending/descending");`
	`78`	`+ hotkey("g", "cycle through percentage display options");`
`78`	`79`	`spacer();`
`79`	`80`	`}`
`80`	`81`	`title("Keys for entry operations");`