mirror of
https://codeberg.org/unspeaker/tek.git
synced 2025-12-07 12:16:42 +01:00
wip: borrow checker battles
This commit is contained in:
parent
1d4db3c629
commit
7fbb40fad6
38 changed files with 778 additions and 708 deletions
|
|
@ -1,6 +1,5 @@
|
|||
use crate::*;
|
||||
|
||||
impl Arranger {
|
||||
impl<'a> Arranger<TuiOutput<'a>, Rect> {
|
||||
pub fn rename_selected (&mut self) {
|
||||
self.modal = Some(Box::new(ArrangerRenameModal::new(
|
||||
self.selected,
|
||||
|
|
@ -13,7 +12,6 @@ impl Arranger {
|
|||
)));
|
||||
}
|
||||
}
|
||||
|
||||
/// Appears on first run (i.e. if state dir is missing).
|
||||
pub struct ArrangerRenameModal {
|
||||
done: bool,
|
||||
|
|
@ -22,7 +20,6 @@ pub struct ArrangerRenameModal {
|
|||
result: Arc<RwLock<String>>,
|
||||
cursor: usize
|
||||
}
|
||||
|
||||
impl ArrangerRenameModal {
|
||||
pub fn new (target: ArrangerFocus, value: &Arc<RwLock<String>>) -> Self {
|
||||
Self {
|
||||
|
|
@ -34,18 +31,17 @@ impl ArrangerRenameModal {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> Render<TuiOutput<'a>, Rect> for ArrangerRenameModal {
|
||||
fn render (&self, to: &mut TuiOutput<'a>) -> Usually<Rect> {
|
||||
let y = area.y + area.height / 2;
|
||||
fn render (&self, to: &mut TuiOutput<'a>) -> Perhaps<Rect> {
|
||||
let y = to.area.y + to.area.height / 2;
|
||||
let bg_area = Rect {
|
||||
x: 1,
|
||||
y: y - 1,
|
||||
width: area.width - 2,
|
||||
width: to.area.width - 2,
|
||||
height: 3
|
||||
};
|
||||
fill_bg(buf, bg_area, Nord::BG0);
|
||||
Lozenge(Style::default().bold().white().dim()).draw(buf, bg_area)?;
|
||||
fill_bg(to.buffer, bg_area, Nord::BG0);
|
||||
Lozenge(Style::default().bold().white().dim()).draw(to.buffer, bg_area)?;
|
||||
let label = match self.target {
|
||||
ArrangerFocus::Mix => "Rename project:",
|
||||
ArrangerFocus::Track(_) => "Rename track:",
|
||||
|
|
@ -53,15 +49,14 @@ impl<'a> Render<TuiOutput<'a>, Rect> for ArrangerRenameModal {
|
|||
ArrangerFocus::Clip(_, _) => "Rename clip:",
|
||||
};
|
||||
let style = Some(Style::default().not_bold().white().not_dim());
|
||||
label.blit(buf, area.x + 3, y, style)?;
|
||||
label.blit(to.buffer, to.area.x + 3, y, style)?;
|
||||
let style = Some(Style::default().bold().white().not_dim());
|
||||
self.value.blit(buf, area.x + 3 + label.len() as u16 + 1, y, style)?;
|
||||
self.value.blit(to.buffer, to.area.x + 3 + label.len() as u16 + 1, y, style)?;
|
||||
let style = Some(Style::default().bold().white().not_dim().reversed());
|
||||
"▂".blit(buf, area.x + 3 + label.len() as u16 + 1 + self.cursor as u16, y, style)?;
|
||||
Ok(area)
|
||||
"▂".blit(to.buffer, to.area.x + 3 + label.len() as u16 + 1 + self.cursor as u16, y, style)?;
|
||||
Ok(Some(to.area))
|
||||
}
|
||||
}
|
||||
|
||||
handle!(ArrangerRenameModal |self, e| {
|
||||
match e {
|
||||
AppEvent::Input(Event::Key(k)) => {
|
||||
|
|
@ -98,7 +93,6 @@ handle!(ArrangerRenameModal |self, e| {
|
|||
_ => Ok(false),
|
||||
}
|
||||
});
|
||||
|
||||
impl Exit for ArrangerRenameModal {
|
||||
fn exited (&self) -> bool {
|
||||
self.done
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue