refactor: begin migration of process widget

1 files changed, 0 insertions, 256 deletions

diff --git a/src/canvas/drawing_utils.rs b/src/canvas/drawing_utils.rs
index 852a18da..126ff0ec 100644
--- a/src/canvas/drawing_utils.rs
+++ b/src/canvas/drawing_utils.rs
@@ -6,117 +6,6 @@ use std::{
     time::Instant,
 };
 
-/// Return a (hard)-width vector for column widths.
-///
-/// * `total_width` is the, well, total width available.  **NOTE:** This function automatically
-/// takes away 2 from the width as part of the left/right
-/// bounds.
-/// * `hard_widths` is inflexible column widths.  Use a `None` to represent a soft width.
-/// * `soft_widths_min` is the lower limit for a soft width.  Use `None` if a hard width goes there.
-/// * `soft_widths_max` is the upper limit for a soft width, in percentage of the total width.  Use
-///   `None` if a hard width goes there.
-/// * `soft_widths_desired` is the desired soft width.  Use `None` if a hard width goes there.
-/// * `left_to_right` is a boolean whether to go from left to right if true, or right to left if
-///   false.
-///
-/// **NOTE:** This function ASSUMES THAT ALL PASSED SLICES ARE OF THE SAME SIZE.
-///
-/// **NOTE:** The returned vector may not be the same size as the slices, this is because including
-/// 0-constraints breaks tui-rs.
-pub fn get_column_widths(
-    total_width: u16, hard_widths: &[Option<u16>], soft_widths_min: &[Option<u16>],
-    soft_widths_max: &[Option<f64>], soft_widths_desired: &[Option<u16>], left_to_right: bool,
-) -> Vec<u16> {
-    debug_assert!(
-        hard_widths.len() == soft_widths_min.len(),
-        "hard width length != soft width min length!"
-    );
-    debug_assert!(
-        soft_widths_min.len() == soft_widths_max.len(),
-        "soft width min length != soft width max length!"
-    );
-    debug_assert!(
-        soft_widths_max.len() == soft_widths_desired.len(),
-        "soft width max length != soft width desired length!"
-    );
-
-    if total_width > 2 {
-        let initial_width = total_width - 2;
-        let mut total_width_left = initial_width;
-        let mut column_widths: Vec<u16> = vec![0; hard_widths.len()];
-        let range: Vec<usize> = if left_to_right {
-            (0..hard_widths.len()).collect()
-        } else {
-            (0..hard_widths.len()).rev().collect()
-        };
-
-        for itx in &range {
-            if let Some(Some(hard_width)) = hard_widths.get(*itx) {
-                // Hard width...
-                let space_taken = min(*hard_width, total_width_left);
-
-                // TODO [COLUMN MOVEMENT]: Remove this
-                if *hard_width > space_taken {
-                    break;
-                }
-
-                column_widths[*itx] = space_taken;
-                total_width_left -= space_taken;
-                total_width_left = total_width_left.saturating_sub(1);
-            } else if let (
-                Some(Some(soft_width_max)),
-                Some(Some(soft_width_min)),
-                Some(Some(soft_width_desired)),
-            ) = (
-                soft_widths_max.get(*itx),
-                soft_widths_min.get(*itx),
-                soft_widths_desired.get(*itx),
-            ) {
-                // Soft width...
-                let soft_limit = max(
-                    if soft_width_max.is_sign_negative() {
-                        *soft_width_desired
-                    } else {
-                        (*soft_width_max * initial_width as f64).ceil() as u16
-                    },
-                    *soft_width_min,
-                );
-                let space_taken = min(min(soft_limit, *soft_width_desired), total_width_left);
-
-                // TODO [COLUMN MOVEMENT]: Remove this
-                if *soft_width_min > space_taken {
-                    break;
-                }
-
-                column_widths[*itx] = space_taken;
-                total_width_left -= space_taken;
-                total_width_left = total_width_left.saturating_sub(1);
-            }
-        }
-
-        while let Some(0) = column_widths.last() {
-            column_widths.pop();
-        }
-
-        if !column_widths.is_empty() {
-            // Redistribute remaining.
-            let amount_per_slot = total_width_left / column_widths.len() as u16;
-            total_width_left %= column_widths.len() as u16;
-            for (index, width) in column_widths.iter_mut().enumerate() {
-                if index < total_width_left.into() {
-                    *width += amount_per_slot + 1;
-                } else {
-                    *width += amount_per_slot;
-                }
-            }
-        }
-
-        column_widths
-    } else {
-        vec![]
-    }
-}
-
 pub fn get_search_start_position(
     num_columns: usize, cursor_direction: &app::CursorDirection, cursor_bar: &mut usize,
     current_cursor_position: usize, is_force_redraw: bool,
@@ -154,45 +43,6 @@ pub fn get_search_start_position(
     }
 }
 
-pub fn get_start_position(
-    num_rows: usize, scroll_direction: &app::ScrollDirection, scroll_position_bar: &mut usize,
-    currently_selected_position: usize, is_force_redraw: bool,
-) -> usize {
-    if is_force_redraw {
-        *scroll_position_bar = 0;
-    }
-
-    // FIXME: Note that num_rows is WRONG here! It assumes the number of rows - 1... oops.
-
-    match scroll_direction {
-        app::ScrollDirection::Down => {
-            if currently_selected_position < *scroll_position_bar + num_rows {
-                // If, using previous_scrolled_position, we can see the element
-                // (so within that and + num_rows) just reuse the current previously scrolled position
-                *scroll_position_bar
-            } else if currently_selected_position >= num_rows {
-                // Else if the current position past the last element visible in the list, omit
-                // until we can see that element
-                *scroll_position_bar = currently_selected_position - num_rows;
-                *scroll_position_bar
-            } else {
-                // Else, if it is not past the last element visible, do not omit anything
-                0
-            }
-        }
-        app::ScrollDirection::Up => {
-            if currently_selected_position <= *scroll_position_bar {
-                // If it's past the first element, then show from that element downwards
-                *scroll_position_bar = currently_selected_position;
-            } else if currently_selected_position >= *scroll_position_bar + num_rows {
-                *scroll_position_bar = currently_selected_position - num_rows;
-            }
-            // Else, don't change what our start position is from whatever it is set to!
-            *scroll_position_bar
-        }
-    }
-}
-
 /// Calculate how many bars are to be drawn within basic mode's components.
 pub fn calculate_basic_use_bars(use_percentage: f64, num_bars_available: usize) -> usize {
     std::cmp::min(
@@ -227,62 +77,6 @@ mod test {
     use super::*;
 
     #[test]
-    fn test_get_start_position() {
-        use crate::app::ScrollDirection::{self, Down, Up};
-
-        fn test(
-            bar: usize, num: usize, direction: ScrollDirection, selected: usize, force: bool,
-            expected_posn: usize, expected_bar: usize,
-        ) {
-            let mut bar = bar;
-            assert_eq!(
-                get_start_position(num, &direction, &mut bar, selected, force),
-                expected_posn
-            );
-            assert_eq!(bar, expected_bar);
-        }
-
-        // Scrolling down from start
-        test(0, 10, Down, 0, false, 0, 0);
-
-        // Simple scrolling down
-        test(0, 10, Down, 1, false, 0, 0);
-
-        // Scrolling down from the middle high up
-        test(0, 10, Down, 5, false, 0, 0);
-
-        // Scrolling down into boundary
-        test(0, 10, Down, 11, false, 1, 1);
-
-        // Scrolling down from the with non-zero bar
-        test(5, 10, Down, 15, false, 5, 5);
-
-        // Force redraw scrolling down (e.g. resize)
-        test(5, 15, Down, 15, true, 0, 0);
-
-        // Test jumping down
-        test(1, 10, Down, 20, true, 10, 10);
-
-        // Scrolling up from bottom
-        test(10, 10, Up, 20, false, 10, 10);
-
-        // Simple scrolling up
-        test(10, 10, Up, 19, false, 10, 10);
-
-        // Scrolling up from the middle
-        test(10, 10, Up, 10, false, 10, 10);
-
-        // Scrolling up into boundary
-        test(10, 10, Up, 9, false, 9, 9);
-
-        // Force redraw scrolling up (e.g. resize)
-        test(5, 10, Up, 15, true, 5, 5);
-
-        // Test jumping up
-        test(10, 10, Up, 0, false, 0, 0);
-    }
-
-    #[test]
     fn test_calculate_basic_use_bars() {
         // Testing various breakpoints and edge cases.
         assert_eq!(calculate_basic_use_bars(0.0, 15), 0);
@@ -329,54 +123,4 @@ mod test {
         ));
         assert!(over_timer.is_none());
     }
-
-    #[test]
-    fn test_width_calculation() {
-        // TODO: Implement width calculation test; can reuse old ones as basis
-    }
-
-    #[test]
-    fn test_zero_width() {
-        assert_eq!(
-            get_column_widths(
-                0,
-                &[Some(1), None, None],
-                &[None, Some(1), Some(2)],
-                &[None, Some(0.125), Some(0.5)],
-                &[None, Some(10), Some(10)],
-                true
-            ),
-            vec![],
-        );
-    }
-
-    #[test]
-    fn test_two_width() {
-        assert_eq!(
-            get_column_widths(
-                2,
-                &[Some(1), None, None],
-                &[None, Some(1), Some(2)],
-                &[None, Some(0.125), Some(0.5)],
-                &[None, Some(10), Some(10)],
-                true
-            ),
-            vec![],
-        );
-    }
-
-    #[test]
-    fn test_non_zero_width() {
-        assert_eq!(
-            get_column_widths(
-                16,
-                &[Some(1), None, None],
-                &[None, Some(1), Some(2)],
-                &[None, Some(0.125), Some(0.5)],
-                &[None, Some(10), Some(10)],
-                true
-            ),
-            vec![2, 2, 7],
-        );
-    }
 }