diff --git a/README.md b/README.md index 7499ac2..89572c8 100644 --- a/README.md +++ b/README.md @@ -83,9 +83,10 @@ width. The separator name is entered in a centered popup for both add and rename actions. The Config tab is a settings/status page: change the profile theme, switch the persisted mixer layout between Vertical and Horizontal, select the profile's -default MIDI controller, restore individual hidden faders, inspect backend and -MIDI-device state, and save the server-owned draft. Save both activates the -validated configuration and persists it; there is no separate Apply step. +default MIDI controller, restore individual faders from the hidden-fader popup, +inspect backend and MIDI-device state, and save the server-owned draft. Save +both activates the validated configuration and persists it; there is no +separate Apply step. Unassigned volume and mute controls inherit that default for MIDI learn. Vertical mode keeps the stacked card appearance and full-width separator rows. Horizontal mode keeps every fader and labeled separator divider in one diff --git a/architecture.md b/architecture.md index 5a837c5..6680052 100644 --- a/architecture.md +++ b/architecture.md @@ -467,11 +467,11 @@ members. Absolute remains the only selectable group mode until the reserved relative-mode runtime work is complete. The secondary Config tab is not an alternative object editor. It presents -profile theme selection, one-action restoration for each hidden fader, unsaved -and Save state, active profile/backend status, MIDI-learn cancellation, and MIDI -device diagnostics. Object and layout edits stay on the main mixer. There is no -separate hidden-fader mode: hidden rows disappear from the mixer and are -restored from this settings page at their retained layout positions. +profile theme selection, a popup listing all hidden faders for individual +restoration, unsaved and Save state, active profile/backend status, MIDI-learn +cancellation, and MIDI device diagnostics. Object and layout edits stay on the +main mixer. There is no separate hidden-fader mode: hidden rows disappear from +the mixer and are restored from this popup at their retained layout positions. Every value presented as configuration is read from the server-owned validated profile draft and every edit targets that same profile field. The TUI must not diff --git a/task.md b/task.md index 9f343df..aca042b 100644 --- a/task.md +++ b/task.md @@ -417,7 +417,9 @@ Dependencies: M8, M2, M1. The normalized table browser and pipe-delimited object commands are removed. Config is now a secondary settings/status page for the persisted profile theme, hidden restoration, Save, learning cancellation, and backend/device - state. + state. Hidden restoration uses one settings action that opens a popup listing + every hidden fader rather than expanding the settings page with one row per + fader. Keep this item open until any remaining required object-creation workflow is available from the mixer and its small-terminal acceptance passes. diff --git a/tui/src/lib.rs b/tui/src/lib.rs index 18c4a6a..8c457f5 100644 --- a/tui/src/lib.rs +++ b/tui/src/lib.rs @@ -822,6 +822,7 @@ pub struct LiveTui { capture_editor: Option, pattern_editor: Option, controller_picker: Option, + hidden_fader_picker: Option, controller_selections: BTreeMap<(String, String), String>, } @@ -842,7 +843,7 @@ enum SettingsRow { Theme, MixerOrientation, DefaultController, - HiddenFader { id: String, label: String }, + HiddenFaders { count: usize }, CancelMidiLearn, Save, } @@ -876,6 +877,11 @@ struct ControllerPicker { selected: usize, } +#[derive(Clone, Debug, Eq, PartialEq)] +struct HiddenFaderPicker { + selected: usize, +} + enum FaderEditorRow { Capture { application: String, @@ -995,6 +1001,7 @@ impl LiveTui { capture_editor: None, pattern_editor: None, controller_picker: None, + hidden_fader_picker: None, controller_selections: BTreeMap::new(), } } @@ -1127,6 +1134,10 @@ impl LiveTui { self.handle_controller_picker_key(key_event.code); return; } + if self.hidden_fader_picker.is_some() { + self.handle_hidden_fader_picker_key(key_event.code); + return; + } if self.fader_editor.is_some() { self.handle_fader_editor_key(key_event.code); return; @@ -1331,35 +1342,10 @@ impl LiveTui { SettingsRow::Theme, SettingsRow::MixerOrientation, SettingsRow::DefaultController, - ]; - rows.extend(self.snapshot.configuration.mixer_layout.iter().filter_map( - |entry| match entry { - MixerLayoutEntry::Fader { - fader, - hidden: true, - .. - } => { - let label = self - .snapshot - .configuration - .faders - .iter() - .find(|configured| configured.id == *fader) - .and_then(|configured| { - self.snapshot - .items - .iter() - .find(|item| item.id == configured.target) - }) - .map_or_else(|| fader.clone(), |item| item.label.clone()); - Some(SettingsRow::HiddenFader { - id: fader.clone(), - label, - }) - } - _ => None, + SettingsRow::HiddenFaders { + count: self.hidden_faders().len(), }, - )); + ]; if self.snapshot.configuration.learning.is_some() { rows.push(SettingsRow::CancelMidiLearn); } @@ -1430,9 +1416,8 @@ impl LiveTui { }; self.apply_layout_edit(ConfigurationEdit::SetDefaultController { surface: next }); } - SettingsRow::HiddenFader { id, .. } if forward => { - self.apply_layout_edit(ConfigurationEdit::SetFaderHidden { id, hidden: false }); - self.clamp_selection(); + SettingsRow::HiddenFaders { count } if forward && count > 0 => { + self.hidden_fader_picker = Some(HiddenFaderPicker { selected: 0 }); } SettingsRow::CancelMidiLearn if forward => self.cancel_midi_learn(), SettingsRow::Save if forward => self.save_configuration(), @@ -1440,6 +1425,70 @@ impl LiveTui { } } + fn hidden_faders(&self) -> Vec<(String, String)> { + self.snapshot + .configuration + .mixer_layout + .iter() + .filter_map(|entry| match entry { + MixerLayoutEntry::Fader { + fader, + hidden: true, + .. + } => { + let label = self + .snapshot + .configuration + .faders + .iter() + .find(|configured| configured.id == *fader) + .and_then(|configured| { + self.snapshot + .items + .iter() + .find(|item| item.id == configured.target) + }) + .map_or_else(|| fader.clone(), |item| item.label.clone()); + Some((fader.clone(), label)) + } + _ => None, + }) + .collect() + } + + fn handle_hidden_fader_picker_key(&mut self, code: KeyCode) { + let hidden_faders = self.hidden_faders(); + let Some(picker) = &mut self.hidden_fader_picker else { + return; + }; + if hidden_faders.is_empty() { + self.hidden_fader_picker = None; + return; + } + match code { + KeyCode::Esc => self.hidden_fader_picker = None, + KeyCode::Up | KeyCode::Char('k') => { + picker.selected = picker.selected.saturating_sub(1); + } + KeyCode::Down | KeyCode::Char('j') => { + picker.selected = (picker.selected + 1).min(hidden_faders.len().saturating_sub(1)); + } + KeyCode::Enter => { + let Some((id, _)) = hidden_faders.get(picker.selected).cloned() else { + return; + }; + self.apply_layout_edit(ConfigurationEdit::SetFaderHidden { id, hidden: false }); + let remaining = self.hidden_faders().len(); + if remaining == 0 { + self.hidden_fader_picker = None; + } else if let Some(picker) = &mut self.hidden_fader_picker { + picker.selected = picker.selected.min(remaining - 1); + } + } + _ => {} + } + } + fn cancel_midi_learn(&mut self) { match self.client.cancel_midi_learn() { Ok(snapshot) => self.replace_snapshot(snapshot), @@ -2173,6 +2222,9 @@ impl Widget for &LiveTui { if self.controller_picker.is_some() { self.render_controller_picker(area, buf); } + if self.hidden_fader_picker.is_some() { + self.render_hidden_fader_picker(area, buf); + } if self.snapshot.configuration.learning.is_some() { self.render_midi_learn_waiting(area, buf); } @@ -2581,6 +2633,51 @@ impl LiveTui { .render(popup, buf); } + fn render_hidden_fader_picker(&self, area: Rect, buf: &mut Buffer) { + let Some(picker) = &self.hidden_fader_picker else { + return; + }; + let theme = self.theme.palette(); + let hidden_faders = self.hidden_faders(); + let height = u16::try_from(hidden_faders.len().saturating_add(4)) + .unwrap_or(u16::MAX) + .min(area.height); + let popup = centered_rect(area, 64, height.max(5)); + let visible_rows = usize::from(popup.height.saturating_sub(2)).max(1); + let first_visible = picker + .selected + .saturating_add(1) + .saturating_sub(visible_rows); + let lines = hidden_faders + .iter() + .enumerate() + .skip(first_visible) + .take(visible_rows) + .map(|(index, (id, label))| { + Line::from(format!( + "{} {label} · {id}", + if index == picker.selected { "▶" } else { " " } + )) + .style(if index == picker.selected { + Style::default().fg(theme.accent).bold() + } else { + Style::default().fg(theme.foreground) + }) + }) + .collect::>(); + Clear.render(popup, buf); + Paragraph::new(Text::from(lines)) + .block( + Block::bordered() + .title(" Show hidden faders ".fg(theme.accent).bold()) + .title_bottom(" ↑↓ select · Enter show · Esc close ".fg(theme.muted)) + .border_set(border::DOUBLE) + .border_style(Style::default().fg(theme.accent)) + .style(Style::default().bg(theme.background)), + ) + .render(popup, buf); + } + fn render_midi_learn_waiting(&self, area: Rect, buf: &mut Buffer) { let theme = self.theme.palette(); let popup = centered_rect(area, 68, 7.min(area.height)); @@ -2666,9 +2763,10 @@ impl LiveTui { ); format!("Default controller {controller} [←→]") } - SettingsRow::HiddenFader { label, .. } => { - format!("Show hidden fader {label} [Enter]") + SettingsRow::HiddenFaders { count } if *count > 0 => { + format!("Show hidden faders {count} [Enter]") } + SettingsRow::HiddenFaders { .. } => "Show hidden faders none".to_owned(), SettingsRow::CancelMidiLearn => "Cancel MIDI learn [Enter]".to_owned(), SettingsRow::Save => format!( "Save changes {}", @@ -2687,13 +2785,6 @@ impl LiveTui { }, )); } - if !config - .mixer_layout - .iter() - .any(|entry| matches!(entry, MixerLayoutEntry::Fader { hidden: true, .. })) - { - lines.push(Line::from(" Hidden faders none").fg(theme.muted)); - } lines.push(Line::from("")); lines.push(Line::from("MIDI devices").fg(theme.accent).bold()); if self.snapshot.devices.is_empty() { @@ -3688,13 +3779,36 @@ mod tests { .iter() .map(|cell| cell.symbol()) .collect::(); - assert!(hidden_rendered.contains("Show hidden fader Music")); - assert!(hidden_rendered.contains("Show hidden fader Browser")); + assert!(hidden_rendered.contains("Show hidden faders 2 [Enter]")); + assert!(!hidden_rendered.contains("Show hidden fader Music")); + assert!(!hidden_rendered.contains("Show hidden fader Browser")); app.handle_key_event(press(KeyCode::Down)); app.handle_key_event(press(KeyCode::Down)); app.handle_key_event(press(KeyCode::Down)); app.handle_key_event(press(KeyCode::Enter)); + let mut popup_buffer = Buffer::empty(area); + (&app).render(area, &mut popup_buffer); + let popup_rendered = popup_buffer + .content + .iter() + .map(|cell| cell.symbol()) + .collect::(); + assert!(popup_rendered.contains("Show hidden faders")); + assert!(popup_rendered.contains("Music")); + assert!(popup_rendered.contains("Browser")); + + app.handle_key_event(press(KeyCode::Enter)); + let mut remaining_buffer = Buffer::empty(area); + (&app).render(area, &mut remaining_buffer); + let remaining_rendered = remaining_buffer + .content + .iter() + .map(|cell| cell.symbol()) + .collect::(); + assert!(!remaining_rendered.contains("Music")); + assert!(remaining_rendered.contains("Browser")); + app.handle_key_event(press(KeyCode::Esc)); app.handle_key_event(press(KeyCode::Tab)); app.handle_key_event(press(KeyCode::Char('a'))); for character in "Outputs".chars() { @@ -4280,7 +4394,7 @@ mod tests { assert!(rendered.contains("unsaved draft")); assert!(rendered.contains("Theme Default")); assert!(rendered.contains("Default controller Desk controller")); - assert!(rendered.contains("Hidden faders none")); + assert!(rendered.contains("Show hidden faders none")); assert!(!rendered.contains("Apply draft")); assert!(rendered.contains("Save changes")); assert!(rendered.contains("Desk controller — connected · 20:0"));