From d06ae946559e41aea240caddb8dc3b66dd32bcc0 Mon Sep 17 00:00:00 2001 From: unspeaker Date: Fri, 6 Dec 2024 01:39:47 +0100 Subject: [PATCH] fbpr: fix scroll --- .../tek_tui/src/tui_control_phrase_editor.rs | 4 ++-- crates/tek_tui/src/tui_view_phrase_editor.rs | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/crates/tek_tui/src/tui_control_phrase_editor.rs b/crates/tek_tui/src/tui_control_phrase_editor.rs index 447be2f5..919391e9 100644 --- a/crates/tek_tui/src/tui_control_phrase_editor.rs +++ b/crates/tek_tui/src/tui_control_phrase_editor.rs @@ -111,11 +111,11 @@ impl Command for PhraseCommand { None }, SetNoteCursor(note) => { - let note = 127.min(note); + let note = 127.min(note); let start = state.note_lo.load(Ordering::Relaxed); state.note_point.store(note, Ordering::Relaxed); if note < start { - state.note_lo.store((note / 2) * 2, Ordering::Relaxed); + state.note_lo.store(note, Ordering::Relaxed); } None }, diff --git a/crates/tek_tui/src/tui_view_phrase_editor.rs b/crates/tek_tui/src/tui_view_phrase_editor.rs index ec9a5514..1670c67a 100644 --- a/crates/tek_tui/src/tui_view_phrase_editor.rs +++ b/crates/tek_tui/src/tui_view_phrase_editor.rs @@ -27,11 +27,11 @@ impl<'a, T: HasEditor> From<&'a T> for PhraseView<'a> { //editor.note_lo.store(note_lo, Ordering::Relaxed); //} let mut note_hi = 127.min((note_lo + height).saturating_sub(2)); - //if note_point > note_hi { - //note_lo += note_point - note_hi; - //note_hi = note_point; - //editor.note_lo.store(note_lo, Ordering::Relaxed); - //} + if note_point > note_hi { + note_lo += note_point - note_hi; + note_hi = note_point; + editor.note_lo.store(note_lo, Ordering::Relaxed); + } Self { focused: state.editor_focused(), entered: state.editor_entered(), @@ -73,12 +73,12 @@ impl<'a> Content for PhraseView<'a> { } = self; let upper_left = format!( - "{note_hi} {note_hi_name} {}", + "╭{note_hi} {note_hi_name} {}", phrase.as_ref().map(|p|p.read().unwrap().name.clone()).unwrap_or(String::new()) ); let lower_left = format!( - "{note_lo} {note_lo_name}" + "╰{note_lo} {note_lo_name}" ); let mut lower_right = format!( @@ -144,8 +144,8 @@ impl<'a> Content for PhraseView<'a> { //} Ok(()) }).push_x(6).align_sw(), - TuiStyle::fg(upper_left.to_string(), title_color).push_x(1).align_nw(), - TuiStyle::fg(lower_left.to_string(), title_color).push_x(1).align_sw(), + TuiStyle::fg(upper_left.to_string(), title_color).align_nw(), + TuiStyle::fg(lower_left.to_string(), title_color).align_sw(), TuiStyle::fg(upper_right.to_string(), title_color).pull_x(1).align_ne().fill_xy(), TuiStyle::fg(lower_right.to_string(), title_color).pull_x(1).align_se().fill_xy(), )