From 0bf9002e6bfc8b656c529c9da2064163ebb34315 Mon Sep 17 00:00:00 2001
From: unspeaker <hora.nqma@protonmail.com>
Date: Sat, 21 Sep 2024 00:34:34 +0300
Subject: [PATCH] ArrangerViewH/V -> H/VArranger

---
 crates/tek_sequencer/src/sequencer.rs | 28 +++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/crates/tek_sequencer/src/sequencer.rs b/crates/tek_sequencer/src/sequencer.rs
index 8e7cd4d5..c367f7e5 100644
--- a/crates/tek_sequencer/src/sequencer.rs
+++ b/crates/tek_sequencer/src/sequencer.rs
@@ -315,18 +315,18 @@ impl Content for Arranger<Tui> {
                     //h + 2,
                 //]))
             match self.mode {
-                ArrangerViewMode::Horizontal => add(&ArrangerViewHorizontal(&self)),
-                ArrangerViewMode::VerticalCompact1 => add(&ArrangerViewVertical(
+                ArrangerViewMode::Horizontal => add(&HorizontalArranger(&self)),
+                ArrangerViewMode::VerticalCompact1 => add(&VerticalArranger(
                     &self,
                     track_clip_name_lengths(self.tracks.as_slice()).as_slice(),
                     (0..=self.scenes.len()).map(|i|(96, 96*i)).collect::<Vec<_>>().as_slice(),
                 )),
-                ArrangerViewMode::VerticalCompact2 => add(&ArrangerViewVertical(
+                ArrangerViewMode::VerticalCompact2 => add(&VerticalArranger(
                     &self,
                     track_clip_name_lengths(self.tracks.as_slice()).as_slice(),
                     (0..=self.scenes.len()).map(|i|(192, 192*i)).collect::<Vec<_>>().as_slice()
                 )),
-                ArrangerViewMode::VerticalExpanded => add(&ArrangerViewVertical(
+                ArrangerViewMode::VerticalExpanded => add(&VerticalArranger(
                     &self,
                     track_clip_name_lengths(self.tracks.as_slice()).as_slice(),
                     scene_ppqs(self.tracks.as_slice(), self.scenes.as_slice()).as_slice(),
@@ -488,11 +488,11 @@ impl ArrangerViewMode {
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-struct ArrangerViewVertical<'a, 'b, E: Engine>(
+struct VerticalArranger<'a, 'b, E: Engine>(
     &'a Arranger<E>, &'b [(usize, usize)], &'b [(usize, usize)]
 );
 
-impl<'a, 'b> Content for ArrangerViewVertical<'a, 'b, Tui> {
+impl<'a, 'b> Content for VerticalArranger<'a, 'b, Tui> {
     type Engine = Tui;
     fn content (&self) -> impl Widget<Engine = Tui> {
         let Self(state, cols, rows) = self;
@@ -500,8 +500,8 @@ impl<'a, 'b> Content for ArrangerViewVertical<'a, 'b, Tui> {
         let scenes = state.scenes.as_ref();
         let offset = 4 + scene_name_max_len(scenes) as u16;
         Layers::new(move |add|{
-            add(&ArrangerVerticalGrid(offset, rows, cols))?;
-            add(&ArrangerVerticalCursor(state.focused, state.selected, offset, cols, rows))?;
+            add(&VerticalArrangerGrid(offset, rows, cols))?;
+            add(&VerticalArrangerCursor(state.focused, state.selected, offset, cols, rows))?;
             add(&Split::down(|add|{
                 add(&Push::X(offset, Split::right(move |add|{
                     for (track, (w, _)) in tracks.iter().zip(*cols) {
@@ -561,9 +561,9 @@ pub fn scene_name_max_len (scenes: &[Scene]) -> usize {
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-struct ArrangerVerticalGrid<'a>(u16, &'a [(usize, usize)], &'a [(usize, usize)]);
+struct VerticalArrangerGrid<'a>(u16, &'a [(usize, usize)], &'a [(usize, usize)]);
 
-impl<'a> Widget for ArrangerVerticalGrid<'a> {
+impl<'a> Widget for VerticalArrangerGrid<'a> {
     type Engine = Tui;
     fn render (&self, to: &mut TuiOutput) -> Usually<()> {
         let area = to.area();
@@ -594,11 +594,11 @@ impl<'a> Widget for ArrangerVerticalGrid<'a> {
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-struct ArrangerVerticalCursor<'a>(
+struct VerticalArrangerCursor<'a>(
     bool, ArrangerFocus, u16, &'a [(usize, usize)], &'a [(usize, usize)]
 );
 
-impl<'a> Widget for ArrangerVerticalCursor<'a> {
+impl<'a> Widget for VerticalArrangerCursor<'a> {
     type Engine = Tui;
     fn render (&self, to: &mut TuiOutput) -> Usually<()> {
         let area = to.area();
@@ -671,11 +671,11 @@ impl<'a> Widget for ArrangerVerticalCursor<'a> {
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-struct ArrangerViewHorizontal<'a, E: Engine>(
+struct HorizontalArranger<'a, E: Engine>(
     &'a Arranger<E>
 );
 
-impl<'a> Content for ArrangerViewHorizontal<'a, Tui> {
+impl<'a> Content for HorizontalArranger<'a, Tui> {
     type Engine = Tui;
     fn content (&self) -> impl Widget<Engine = Tui> {
         let Arranger { tracks, focused, selected, scenes, .. } = self.0;