Skip to content

solved issue #42 and #37 #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Onufrei-Andrei wants to merge 1 commit into
base: master
Choose a base branch
from
Open

solved issue #42 and #37 #43

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 46 additions & 23 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ pub struct TableView<T, H> {
needs_relayout: bool,

column_select: bool,
hide_sort_button: bool,
columns: Vec<TableColumn<H>>,
column_indicies: HashMap<H, usize>,

Expand Down Expand Up @@ -191,6 +192,7 @@ where
needs_relayout: true,

column_select: false,
hide_sort_button: false,
columns: Vec::new(),
column_indicies: HashMap::new(),

Expand Down Expand Up @@ -277,6 +279,10 @@ where
pub fn default_column(mut self, column: H) -> Self {
self.set_default_column(column);
self
}``

pub fn columns(&self) -> Vec<H> {
self.columns.iter().map(|col| col.column).collect()
}

/// Sets the initially active column of the table.
Expand All @@ -293,6 +299,11 @@ where
}
}

pub fn hide_sort_button_header(mut self) -> Self {
self.hide_sort_button = true;
self
}

/// Sorts the table using the specified table `column` and the passed
/// `order`.
pub fn sort_by(&mut self, column: H, order: Ordering) {
Expand Down Expand Up @@ -1142,31 +1153,43 @@ impl<H: Copy + Clone + 'static> TableColumn<H> {
}

fn draw_header(&self, printer: &Printer) {
let order = match self.order {
Ordering::Less => "^",
Ordering::Greater => "v",
Ordering::Equal => " ",
// Determine sort indicator (only if sort button is visible)
let order = if self.hide_sort_button {
"" // No sort indicator if button is hidden
} else {
match self.order {
Ordering::Less => "^",
Ordering::Greater => "v",
Ordering::Equal => " ",
}
};

let header = match self.alignment {
HAlign::Left => format!(
"{:<width$} [{}]",
self.title,
order,
width = self.width.saturating_sub(4)
),
HAlign::Right => format!(
"{:>width$} [{}]",
self.title,
order,
width = self.width.saturating_sub(4)
),
HAlign::Center => format!(
"{:^width$} [{}]",
self.title,
order,
width = self.width.saturating_sub(4)
),
// Format header based on alignment and width
let header = if self.hide_sort_button {
// No sort button, use full width for title
format!("{:<width$}", self.title, width = self.width)
} else {
// Include sort button
match self.alignment {
HAlign::Left => format!(
"{:<width$} [{}]",
self.title,
order,
width = self.width.saturating_sub(4)
),
HAlign::Right => format!(
"{:>width$} [{}]",
self.title,
order,
width = self.width.saturating_sub(4)
),
HAlign::Center => format!(
"{:^width$} [{}]",
self.title,
order,
width = self.width.saturating_sub(4)
),
}
};

printer.print((0, 0), header.as_str());
Expand Down