unspeaker/tek
1
0
Fork 0
mirror of https://codeberg.org/unspeaker/tek.git synced 2025-12-07 04:06:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

implement has_size

Browse source
This commit is contained in:
🪞👃🪞 2024-12-14 22:58:03 +01:00
parent aa8a1a3bd9
commit c27a4a5232
3 changed files with 17 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/tek/src/layout/measure.rs
View file

@ -4,19 +4,13 @@ pub trait HasSize<E: Engine> {
fn size (&self) -> &Measure<E>; fn size (&self) -> &Measure<E>;
} }
#[macro_export] macro_rules! implementor { #[macro_export] macro_rules! has_size {
($name:ident => $Trait:ident) => { (<$E:ty>|$self:ident:$Struct:ident$(<$($L:lifetime),*$($T:ident$(:$U:path)?),*>)?|$cb:expr) => {
#[macro_export] macro_rules! $name { impl $(<$($L),*$($T $(: $U)?),*>)? HasSize<$E> for $Struct $(<$($L),*$($T),*>)? {
(|$self:ident:$Struct:ident$(<$($L:lifetime),*$($T:ident$(:$U:path)?),*>)?|$cb:expr) => { fn size (&$self) -> &Measure<$E> { $cb } // TODO provide trait body
impl $(<$($L),*$($T $(: $U)?),*>)? $Trait for $Struct $(<$($L),*$($T),*>)? {
fn clock (&$self) -> &ClockModel { $cb }
} }
} }
} }
}
}
implementor!(has_size => HasSize);
impl<E: Engine> LayoutDebug<E> for E {} impl<E: Engine> LayoutDebug<E> for E {}

4
crates/tek/src/tui/phrase_editor.rs
View file

@ -111,7 +111,7 @@ impl Default for PhraseEditorModel {
render!(|self: PhraseEditorModel|self.mode); render!(|self: PhraseEditorModel|self.mode);
pub trait PhraseViewMode: Render<Tui> + MIDIRange + MIDIPoint + Debug + Send + Sync { pub trait PhraseViewMode: Render<Tui> + HasSize<Tui> + MIDIRange + MIDIPoint + Debug + Send + Sync {
fn buffer_size (&self, phrase: &Phrase) -> (usize, usize); fn buffer_size (&self, phrase: &Phrase) -> (usize, usize);
fn redraw (&mut self); fn redraw (&mut self);
fn phrase (&self) -> &Option<Arc<RwLock<Phrase>>>; fn phrase (&self) -> &Option<Arc<RwLock<Phrase>>>;
@ -124,7 +124,7 @@ pub trait PhraseViewMode: Render<Tui> + MIDIRange + MIDIPoint + Debug + Send + S
impl MIDIViewport<Tui> for PhraseEditorModel {} impl MIDIViewport<Tui> for PhraseEditorModel {}
has_size!(|self:PhraseEditorModel|&self.size); has_size!(<Tui>|self:PhraseEditorModel|self.mode.size());
impl MIDIRange for PhraseEditorModel { impl MIDIRange for PhraseEditorModel {
fn time_zoom (&self) -> usize { self.mode.time_zoom() } fn time_zoom (&self) -> usize { self.mode.time_zoom() }

2
crates/tek/src/tui/piano_horizontal.rs
View file

@ -241,6 +241,8 @@ impl PianoHorizontal {
} }
} }
has_size!(<Tui>|self:PianoHorizontal|&self.size);
impl MIDIRange for PianoHorizontal { impl MIDIRange for PianoHorizontal {
fn time_zoom (&self) -> usize { self.range.time_zoom() } fn time_zoom (&self) -> usize { self.range.time_zoom() }
fn set_time_zoom (&self, x: usize) { self.range.set_time_zoom(x); } fn set_time_zoom (&self, x: usize) { self.range.set_time_zoom(x); }