wip(p61,e38)

This commit is contained in:
🪞👃🪞 2024-11-21 00:25:54 +01:00
parent 9d4fcaa32b
commit 76da19d9c6
12 changed files with 172 additions and 141 deletions

View file

@ -18,7 +18,7 @@ pub enum SequencerFocus {
/// The transport (toolbar) is focused
Transport,
/// The phrase list (pool) is focused
PhrasePool,
Phrases,
/// The phrase editor (sequencer) is focused
PhraseEditor,
}
@ -32,7 +32,7 @@ pub enum ArrangerFocus {
/// The arrangement (grid) is focused
Arranger,
/// The phrase list (pool) is focused
PhrasePool,
Phrases,
/// The phrase editor (sequencer) is focused
PhraseEditor,
}
@ -150,7 +150,7 @@ impl FocusGrid for SequencerTui {
&[
&[Menu, Menu ],
&[Transport, Transport ],
&[PhrasePool, PhraseEditor],
&[Phrases, PhraseEditor],
]
}
fn focus_update (&mut self) {
@ -161,20 +161,22 @@ impl FocusGrid for SequencerTui {
impl FocusEnter for ArrangerTui {
type Item = ArrangerFocus;
fn focus_enter (&mut self) {
use ArrangerFocus::*;
let focused = self.focused();
if !self.entered {
self.entered = focused == Arranger;
self.editor.entered = focused == PhraseEditor;
self.phrases.entered = focused == PhrasePool;
}
self.entered = true;
//use ArrangerFocus::*;
//let focused = self.focused();
//if !self.entered {
//self.entered = focused == Arranger;
//self.editor.entered = focused == PhraseEditor;
//self.phrases.entered = focused == Phrases;
//}
}
fn focus_exit (&mut self) {
if self.entered {
self.entered = false;
self.editor.entered = false;
self.phrases.entered = false;
}
self.entered = false;
//if self.entered {
//self.entered = false;
//self.editor.entered = false;
//self.phrases.entered = false;
//}
}
fn focus_entered (&self) -> Option<Self::Item> {
if self.entered {
@ -200,7 +202,7 @@ impl FocusGrid for ArrangerTui {
&[Menu, Menu ],
&[Transport, Transport ],
&[Arranger, Arranger ],
&[PhrasePool, PhraseEditor],
&[Phrases, PhraseEditor],
]
}
fn focus_update (&mut self) {