|
|
|
|
@ -1,19 +1,10 @@
|
|
|
|
|
use crate::{
|
|
|
|
|
buffer::Buffer,
|
|
|
|
|
layout::{Constraint, Rect},
|
|
|
|
|
layout::{Constraint, Direction, Layout, Rect},
|
|
|
|
|
style::Style,
|
|
|
|
|
text::Text,
|
|
|
|
|
widgets::{Block, StatefulWidget, Widget},
|
|
|
|
|
};
|
|
|
|
|
use cassowary::{
|
|
|
|
|
strength::{MEDIUM, REQUIRED, WEAK},
|
|
|
|
|
WeightedRelation::*,
|
|
|
|
|
{Expression, Solver},
|
|
|
|
|
};
|
|
|
|
|
use std::{
|
|
|
|
|
collections::HashMap,
|
|
|
|
|
iter::{self, Iterator},
|
|
|
|
|
};
|
|
|
|
|
use unicode_width::UnicodeWidthStr;
|
|
|
|
|
|
|
|
|
|
/// A [`Cell`] contains the [`Text`] to be displayed in a [`Row`] of a [`Table`].
|
|
|
|
|
@ -276,69 +267,33 @@ impl<'a> Table<'a> {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn get_columns_widths(&self, max_width: u16, has_selection: bool) -> Vec<u16> {
|
|
|
|
|
let mut solver = Solver::new();
|
|
|
|
|
let mut var_indices = HashMap::new();
|
|
|
|
|
let mut ccs = Vec::new();
|
|
|
|
|
let mut variables = Vec::new();
|
|
|
|
|
for i in 0..self.widths.len() {
|
|
|
|
|
let var = cassowary::Variable::new();
|
|
|
|
|
variables.push(var);
|
|
|
|
|
var_indices.insert(var, i);
|
|
|
|
|
}
|
|
|
|
|
let spacing_width = (variables.len() as u16).saturating_sub(1) * self.column_spacing;
|
|
|
|
|
let mut available_width = max_width.saturating_sub(spacing_width);
|
|
|
|
|
let mut constraints = Vec::with_capacity(self.widths.len() * 2 + 1);
|
|
|
|
|
if has_selection {
|
|
|
|
|
let highlight_symbol_width =
|
|
|
|
|
self.highlight_symbol.map(|s| s.width() as u16).unwrap_or(0);
|
|
|
|
|
available_width = available_width.saturating_sub(highlight_symbol_width);
|
|
|
|
|
constraints.push(Constraint::Length(highlight_symbol_width));
|
|
|
|
|
}
|
|
|
|
|
for (i, constraint) in self.widths.iter().enumerate() {
|
|
|
|
|
ccs.push(variables[i] | GE(WEAK) | 0.);
|
|
|
|
|
ccs.push(match *constraint {
|
|
|
|
|
Constraint::Length(v) => variables[i] | EQ(MEDIUM) | f64::from(v),
|
|
|
|
|
Constraint::Percentage(v) => {
|
|
|
|
|
variables[i] | EQ(WEAK) | (f64::from(v * available_width) / 100.0)
|
|
|
|
|
}
|
|
|
|
|
Constraint::Ratio(n, d) => {
|
|
|
|
|
variables[i]
|
|
|
|
|
| EQ(WEAK)
|
|
|
|
|
| (f64::from(available_width) * f64::from(n) / f64::from(d))
|
|
|
|
|
}
|
|
|
|
|
Constraint::Min(v) => variables[i] | GE(WEAK) | f64::from(v),
|
|
|
|
|
Constraint::Max(v) => variables[i] | LE(WEAK) | f64::from(v),
|
|
|
|
|
})
|
|
|
|
|
for constraint in self.widths {
|
|
|
|
|
constraints.push(*constraint);
|
|
|
|
|
constraints.push(Constraint::Length(self.column_spacing));
|
|
|
|
|
}
|
|
|
|
|
solver
|
|
|
|
|
.add_constraint(
|
|
|
|
|
variables
|
|
|
|
|
.iter()
|
|
|
|
|
.fold(Expression::from_constant(0.), |acc, v| acc + *v)
|
|
|
|
|
| LE(REQUIRED)
|
|
|
|
|
| f64::from(available_width),
|
|
|
|
|
)
|
|
|
|
|
.unwrap();
|
|
|
|
|
solver.add_constraints(&ccs).unwrap();
|
|
|
|
|
let mut widths = vec![0; variables.len()];
|
|
|
|
|
for &(var, value) in solver.fetch_changes() {
|
|
|
|
|
let index = var_indices[&var];
|
|
|
|
|
let value = if value.is_sign_negative() {
|
|
|
|
|
0
|
|
|
|
|
} else {
|
|
|
|
|
value.round() as u16
|
|
|
|
|
};
|
|
|
|
|
widths[index] = value;
|
|
|
|
|
if !self.widths.is_empty() {
|
|
|
|
|
constraints.pop();
|
|
|
|
|
}
|
|
|
|
|
// Cassowary could still return columns widths greater than the max width when there are
|
|
|
|
|
// fixed length constraints that cannot be satisfied. Therefore, we clamp the widths from
|
|
|
|
|
// left to right.
|
|
|
|
|
let mut available_width = max_width;
|
|
|
|
|
for w in &mut widths {
|
|
|
|
|
*w = available_width.min(*w);
|
|
|
|
|
available_width = available_width
|
|
|
|
|
.saturating_sub(*w)
|
|
|
|
|
.saturating_sub(self.column_spacing);
|
|
|
|
|
let mut chunks = Layout::default()
|
|
|
|
|
.direction(Direction::Horizontal)
|
|
|
|
|
.constraints(constraints)
|
|
|
|
|
.expand_to_fill(false)
|
|
|
|
|
.split(Rect {
|
|
|
|
|
x: 0,
|
|
|
|
|
y: 0,
|
|
|
|
|
width: max_width,
|
|
|
|
|
height: 1,
|
|
|
|
|
});
|
|
|
|
|
if has_selection {
|
|
|
|
|
chunks.remove(0);
|
|
|
|
|
}
|
|
|
|
|
widths
|
|
|
|
|
chunks.iter().step_by(2).map(|c| c.width).collect()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn get_row_bounds(
|
|
|
|
|
@ -347,6 +302,7 @@ impl<'a> Table<'a> {
|
|
|
|
|
offset: usize,
|
|
|
|
|
max_height: u16,
|
|
|
|
|
) -> (usize, usize) {
|
|
|
|
|
let offset = offset.min(self.rows.len().saturating_sub(1));
|
|
|
|
|
let mut start = offset;
|
|
|
|
|
let mut end = offset;
|
|
|
|
|
let mut height = 0;
|
|
|
|
|
@ -427,9 +383,7 @@ impl<'a> StatefulWidget for Table<'a> {
|
|
|
|
|
let has_selection = state.selected.is_some();
|
|
|
|
|
let columns_widths = self.get_columns_widths(table_area.width, has_selection);
|
|
|
|
|
let highlight_symbol = self.highlight_symbol.unwrap_or("");
|
|
|
|
|
let blank_symbol = iter::repeat(" ")
|
|
|
|
|
.take(highlight_symbol.width())
|
|
|
|
|
.collect::<String>();
|
|
|
|
|
let blank_symbol = " ".repeat(highlight_symbol.width());
|
|
|
|
|
let mut current_height = 0;
|
|
|
|
|
let mut rows_height = table_area.height;
|
|
|
|
|
|
|
|
|
|
|
Christian Visintin
3 years ago
committed by
GitHub