ilyakooo0/helix
1
0
Fork 0
mirror of https://github.com/ilyakooo0/helix.git synced 2024-12-01 19:58:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Simplify ui/menu.rs

Browse Source
This commit is contained in:
Blaž Hrastnik 2021-07-23 18:10:17 +09:00
parent 25103833b2
commit 58d08d36ae
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
helix-term/src/ui/menu.rs
View File

@ -233,16 +233,16 @@ impl<T: Item + 'static> Component for Menu<T> {
let max_lens = self.options.iter().fold(vec![0; n], |mut acc, option| { let max_lens = self.options.iter().fold(vec![0; n], |mut acc, option| {
let row = option.row(); let row = option.row();
// maintain max for each column // maintain max for each column
for (i, cell) in row.cells.iter().enumerate() { for (acc, cell) in acc.iter_mut().zip(row.cells.iter()) {
let width = cell.content.width(); let width = cell.content.width();
if width > acc[i] { if width > *acc {
acc[i] = width; *acc = width;
} }
} }
acc acc
}); });
let len = (max_lens.iter().sum::<usize>()) + n + 1; // +1: reserve some space for scrollbar let len = max_lens.iter().sum::<usize>() + n + 1; // +1: reserve some space for scrollbar
let width = len.min(viewport.0 as usize); let width = len.min(viewport.0 as usize);
self.widths = max_lens self.widths = max_lens
@ -250,9 +250,7 @@ impl<T: Item + 'static> Component for Menu<T> {
.map(|len| Constraint::Length(len as u16)) .map(|len| Constraint::Length(len as u16))
.collect(); .collect();
const MAX: usize = 10; let height = self.options.len().min(10).min(viewport.1 as usize);
let height = std::cmp::min(self.options.len(), MAX);
let height = std::cmp::min(height, viewport.1 as usize);
self.size = (width as u16, height as u16); self.size = (width as u16, height as u16);