Mirrors/mmtc
2
0
Fork 0
mirror of https://github.com/figsoda/mmtc synced 2024-11-21 22:53:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

clean up code

Browse source
This commit is contained in:
figsoda 2020-10-30 17:41:00 -04:00
parent 9e1ec98d17
commit f6bf51fbf5
1 changed files with 28 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
src/layout.rs
View file

@ -33,20 +33,13 @@ pub fn render(
});
for x in xs {
match x {
Constrained::Free(w) => {
ws.push(w);
cs.push(Constraint::Min(0));
}
Constrained::Fixed(n, w) => {
ws.push(w);
cs.push(Constraint::Length(*n));
}
Constrained::Ratio(n, w) => {
ws.push(w);
cs.push(Constraint::Ratio(*n, denom));
}
}
let (w, constraint) = match x {
Constrained::Free(w) => (w, Constraint::Min(1)),
Constrained::Fixed(n, w) => (w, Constraint::Length(*n)),
Constrained::Ratio(n, w) => (w, Constraint::Ratio(*n, denom)),
};
ws.push(w);
cs.push(constraint);
}
let layout = Layout::default()
@ -74,21 +67,15 @@ pub fn render(
});
for x in xs {
match x {
Constrained::Free(w) => {
ws.push(w);
cs.push(Constraint::Min(0));
}
Constrained::Fixed(n, w) => {
ws.push(w);
cs.push(Constraint::Length(*n));
}
Constrained::Ratio(n, w) => {
ws.push(w);
cs.push(Constraint::Ratio(*n, denom));
}
}
let (w, constraint) = match x {
Constrained::Free(w) => (w, Constraint::Min(1)),
Constrained::Fixed(n, w) => (w, Constraint::Length(*n)),
Constrained::Ratio(n, w) => (w, Constraint::Ratio(*n, denom)),
};
ws.push(w);
cs.push(constraint);
}
let layout = Layout::default()
.direction(Direction::Horizontal)
.constraints(cs);
@ -123,45 +110,26 @@ pub fn render(
}
});
let len = columns.capacity();
let current_track = if let Some(Song { pos, .. }) = status.song {
queue.get(pos)
} else {
None
};
for column in columns {
match column {
Constrained::Free(xs) => {
let mut items = Vec::with_capacity(len);
for x in queue {
let mut spans = Vec::new();
flatten(&mut spans, xs, status, current_track, Some(x));
items.push(ListItem::new(Spans::from(spans)));
}
ws.push(List::new(items));
cs.push(Constraint::Min(1));
}
Constrained::Fixed(n, xs) => {
let mut items = Vec::with_capacity(len);
for x in queue {
let mut spans = Vec::new();
flatten(&mut spans, xs, status, current_track, Some(x));
items.push(ListItem::new(Spans::from(spans)));
}
ws.push(List::new(items));
cs.push(Constraint::Length(*n));
}
Constrained::Ratio(n, xs) => {
let mut items = Vec::with_capacity(len);
for x in queue {
let mut spans = Vec::new();
flatten(&mut spans, xs, status, current_track, Some(x));
items.push(ListItem::new(Spans::from(spans)));
}
ws.push(List::new(items));
cs.push(Constraint::Ratio(*n, denom));
}
let (xs, constraint) = match column {
Constrained::Free(xs) => (xs, Constraint::Min(1)),
Constrained::Fixed(n, xs) => (xs, Constraint::Length(*n)),
Constrained::Ratio(n, xs) => (xs, Constraint::Ratio(*n, denom)),
};
let mut items = Vec::with_capacity(len);
for x in queue {
let mut spans = Vec::new();
flatten(&mut spans, xs, status, current_track, Some(x));
items.push(ListItem::new(Spans::from(spans)));
}
ws.push(List::new(items));
cs.push(constraint);
}
let layout = Layout::default()