remove AppFocus

crates/tek_tui/src/tui_app_transport.rs

@@ -6,7 +6,7 @@ pub struct TransportTui {
     pub clock:  ClockModel,
     pub size:   Measure<Tui>,
     pub cursor: (usize, usize),
-    pub focus:  FocusState<AppFocus<TransportFocus>>,
+    pub focus:  FocusState<TransportFocus>,
 }
 
 /// Create app state from JACK handle.
@@ -18,9 +18,7 @@ impl TryFrom<&Arc<RwLock<JackClient>>> for TransportTui {
             clock:  ClockModel::from(&Arc::new(jack.read().unwrap().transport())),
             size:   Measure::new(),
             cursor: (0, 0),
-            focus:  FocusState::Entered(
-                AppFocus::Content(TransportFocus::PlayPause)
-            )
+            focus:  FocusState::Entered(TransportFocus::PlayPause)
         })
     }
 }
@@ -60,11 +58,11 @@ impl FocusWrap<TransportFocus> for Option<TransportFocus> {
 impl_focus!(TransportTui TransportFocus [
     //&[Menu],
     &[
-        Content(PlayPause),
-        Content(Bpm),
-        Content(Quant),
-        Content(Sync),
-        Content(Clock),
+        PlayPause,
+        Bpm,
+        Quant,
+        Sync,
+        Clock,
     ],
 ]);