From 571d475657ce066a7c11b3d09cdbab8db6a50f6c Mon Sep 17 00:00:00 2001 From: unspeaker Date: Mon, 25 Nov 2024 18:35:57 +0100 Subject: [PATCH] fix transport focus order --- crates/tek_tui/src/tui_app_arranger.rs | 6 ++++-- crates/tek_tui/src/tui_app_sequencer.rs | 6 ++++-- crates/tek_tui/src/tui_app_transport.rs | 6 ++++-- crates/tek_tui/src/tui_view_transport.rs | 6 +++--- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/crates/tek_tui/src/tui_app_arranger.rs b/crates/tek_tui/src/tui_app_arranger.rs index f3db017a..99d85670 100644 --- a/crates/tek_tui/src/tui_app_arranger.rs +++ b/crates/tek_tui/src/tui_app_arranger.rs @@ -48,8 +48,10 @@ impl TryFrom<&Arc>> for ArrangerTui { status_bar: None, midi_buf: vec![vec![];65536], note_buf: vec![], - focus: FocusState::Entered(AppFocus::Content(ArrangerFocus::Transport(TransportFocus::Bpm))), perf: PerfModel::default(), + focus: FocusState::Entered( + AppFocus::Content(ArrangerFocus::Transport(TransportFocus::PlayPause)) + ), }) } } @@ -79,8 +81,8 @@ impl_focus!(ArrangerTui ArrangerFocus [ Content(Transport(TransportFocus::PlayPause)), Content(Transport(TransportFocus::Bpm)), Content(Transport(TransportFocus::Sync)), + Content(Transport(TransportFocus::Quant)), Content(Transport(TransportFocus::Clock)), - Content(Transport(TransportFocus::Quant)) ], &[ Content(Arranger), Content(Arranger), diff --git a/crates/tek_tui/src/tui_app_sequencer.rs b/crates/tek_tui/src/tui_app_sequencer.rs index 8c65d3d8..f9f5eaa2 100644 --- a/crates/tek_tui/src/tui_app_sequencer.rs +++ b/crates/tek_tui/src/tui_app_sequencer.rs @@ -33,8 +33,10 @@ impl TryFrom<&Arc>> for SequencerTui { midi_buf: vec![vec![];65536], note_buf: vec![], clock, - focus: FocusState::Entered(AppFocus::Content(SequencerFocus::Transport(TransportFocus::Bpm))), perf: PerfModel::default(), + focus: FocusState::Entered( + AppFocus::Content(SequencerFocus::Transport(TransportFocus::PlayPause)) + ), }) } } @@ -62,8 +64,8 @@ impl_focus!(SequencerTui SequencerFocus [ Content(Transport(TransportFocus::PlayPause)), Content(Transport(TransportFocus::Bpm)), Content(Transport(TransportFocus::Sync)), + Content(Transport(TransportFocus::Quant)), Content(Transport(TransportFocus::Clock)), - Content(Transport(TransportFocus::Quant)) ], &[ Content(Phrases), diff --git a/crates/tek_tui/src/tui_app_transport.rs b/crates/tek_tui/src/tui_app_transport.rs index 9386c5f7..330c3eaa 100644 --- a/crates/tek_tui/src/tui_app_transport.rs +++ b/crates/tek_tui/src/tui_app_transport.rs @@ -18,7 +18,9 @@ impl TryFrom<&Arc>> for TransportTui { clock: ClockModel::from(&Arc::new(jack.read().unwrap().transport())), size: Measure::new(), cursor: (0, 0), - focus: FocusState::Entered(AppFocus::Content(TransportFocus::Bpm)) + focus: FocusState::Entered( + AppFocus::Content(TransportFocus::PlayPause) + ) }) } } @@ -60,9 +62,9 @@ impl_focus!(TransportTui TransportFocus [ &[ Content(PlayPause), Content(Bpm), + Content(Quant), Content(Sync), Content(Clock), - Content(Quant) ], ]); diff --git a/crates/tek_tui/src/tui_view_transport.rs b/crates/tek_tui/src/tui_view_transport.rs index efdef0be..a4415031 100644 --- a/crates/tek_tui/src/tui_view_transport.rs +++ b/crates/tek_tui/src/tui_view_transport.rs @@ -41,12 +41,12 @@ impl Content for TransportView { format!("{}.{:03}", *bpm as usize, (bpm * 1000.0) % 1000.0) } })), - selected.wrap(TransportFocus::Quant, &Outset::X(1u16, row! { - "QUANT ", pulses_to_name(*quant as usize) - })), selected.wrap(TransportFocus::Sync, &Outset::X(1u16, row! { "SYNC ", pulses_to_name(*sync as usize) })), + selected.wrap(TransportFocus::Quant, &Outset::X(1u16, row! { + "QUANT ", pulses_to_name(*quant as usize) + })), selected.wrap(TransportFocus::Clock, &{ row!("B" , beat.as_str(), " T", msu.as_str()).outset_x(1) }).align_e().fill_x(),