Radish alpha
r
rad:z39mP9rQAaGmERfUMPULfPUi473tY
Radicle terminal user interface
Radicle
Git
lib/ui: Fix clippy warnings
Erik Kundt committed 3 months ago
commit 96da3127f88b22b5c861ae84ac4183215093896e
parent 0ed16bb
2 files changed +11 -16
modified src/ui/im.rs
@@ -562,6 +562,7 @@ where
        )
    }

+
    #[allow(clippy::too_many_arguments)]
    pub fn table<'a, R, const W: usize>(
        &mut self,
        frame: &mut Frame,
@@ -580,10 +581,10 @@ where
            .ui(self, frame)
    }

-
    pub fn tree<'a, R, Id>(
+
    pub fn tree<R, Id>(
        &mut self,
        frame: &mut Frame,
-
        items: &'a Vec<R>,
+
        items: &'_ Vec<R>,
        opened: &mut Option<HashSet<Vec<Id>>>,
        selected: &mut Option<Vec<Id>>,
        borders: Option<Borders>,
modified src/ui/im/widget.rs
@@ -581,13 +581,6 @@ where
        M: Clone,
    {
        let mut response = Response::default();
-

-
        let (area, area_focus) = ui.next_area().unwrap_or_default();
-

-
        // let show_scrollbar = self.show_scrollbar && self.items.len() >= area.height.into();
-
        let show_scrollbar = true;
-
        let has_items = !self.items.is_empty();
-

        let mut state = TreeState {
            internal: {
                let mut state = tui_tree_widget::TreeState::default();
@@ -612,20 +605,21 @@ where
            items.extend(item.rows());
        }

-
        let tree_style = if !area_focus && self.dim {
-
            Style::default().dim()
-
        } else {
-
            Style::default()
-
        };
-

+
        let (area, area_focus) = ui.next_area().unwrap_or_default();
        let border_style = if area_focus && ui.has_focus {
            ui.theme.focus_border_style
        } else {
            ui.theme.border_style
        };
-

        let area = render_block(frame, area, self.borders, border_style);

+
        let tree_style = if !area_focus && self.dim {
+
            Style::default().dim()
+
        } else {
+
            Style::default()
+
        };
+

+
        let show_scrollbar = self.show_scrollbar && self.items.len() >= area.height.into();
        let tree = if show_scrollbar {
            tui_tree_widget::Tree::new(&items)
                .expect("all item identifiers are unique")