From b0f491903016a1d8d327d9db70a1d4443436aee5 Mon Sep 17 00:00:00 2001
From: unspeaker <hora.nqma@protonmail.com>
Date: Mon, 19 Aug 2024 12:40:46 +0300
Subject: [PATCH] arranger: area corners

---
 crates/tek_sequencer/src/arranger_view.rs   |  8 ++++++--
 crates/tek_sequencer/src/arranger_view_v.rs | 16 ++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/crates/tek_sequencer/src/arranger_view.rs b/crates/tek_sequencer/src/arranger_view.rs
index 5e91e75a..d994b896 100644
--- a/crates/tek_sequencer/src/arranger_view.rs
+++ b/crates/tek_sequencer/src/arranger_view.rs
@@ -46,10 +46,14 @@ render!(Arranger |self, buf, area| {
                 };
                 match self.focus_sequencer {
                     true => {
-                        "[Arrows] Move, [A]dd, [D]elete, [R]ecord, [P]lay".blit(buf, area.x + 1, area.height - 1, None)?;
+                        "[Arrows] Move, [A]dd, [D]elete, [R]ecord, [P]lay".blit(
+                            buf, area.x + 1, area.height - 1, Some(Style::default().dim())
+                        )?;
                     },
                     false => {
-                        "[Arrows] Move, [P]lay, [R]ecord, [N]ame, [E]dit, [C-T]rack add, [C-A]dd scene".blit(buf, area.x + 1, area.y + arrangement.height, None)?;
+                        "[Arrows] Move, [P]lay, [R]ecord, [N]ame, [E]dit, [C-T]rack add, [C-A]dd scene".blit(
+                            buf, area.x + 1, area.y + arrangement.height, Some(Style::default().dim())
+                        )?;
                     },
                 }
                 Corners(Style::default().green().not_dim()).draw(buf, match self.focus_sequencer {
diff --git a/crates/tek_sequencer/src/arranger_view_v.rs b/crates/tek_sequencer/src/arranger_view_v.rs
index 16517ac1..d57785bd 100644
--- a/crates/tek_sequencer/src/arranger_view_v.rs
+++ b/crates/tek_sequencer/src/arranger_view_v.rs
@@ -76,15 +76,15 @@ fn cursor_focus <'a> (
     state: &'a Arranger, offset: u16, cols: &'a [(usize, usize)], rows: &'a [(usize, usize)],
 ) -> impl Render + 'a {
     move |buf: &mut Buffer, area: Rect| {
-        match state.selected {
+        let area = match state.selected {
             ArrangerFocus::Mix => if state.focused
                 && state.entered
                 && state.selected == ArrangerFocus::Mix
             {
                 fill_bg(buf, area, Nord::bg_hi(state.focused, state.entered));
-                Corners(Style::default().green().not_dim()).draw(buf, area)
+                area
             } else {
-                Ok(area)
+                area
             },
             ArrangerFocus::Track(t) => {
                 let area = Rect {
@@ -94,7 +94,7 @@ fn cursor_focus <'a> (
                     height: area.height
                 };
                 fill_bg(buf, area, Nord::bg_hi(state.focused, state.entered));
-                Corners(Style::default().green().not_dim()).draw(buf, area)
+                area
             },
             ArrangerFocus::Scene(s) => {
                 let area = Rect {
@@ -104,7 +104,7 @@ fn cursor_focus <'a> (
                     height: (rows[s].0 / 96) as u16
                 };
                 fill_bg(buf, area, Nord::bg_hi(state.focused, state.entered));
-                Corners(Style::default().green().not_dim()).draw(buf, area)
+                area
             },
             ArrangerFocus::Clip(t, s) => {
                 let track_area = Rect {
@@ -130,9 +130,13 @@ fn cursor_focus <'a> (
                 fill_bg(buf, track_area, lo);
                 fill_bg(buf, scene_area, lo);
                 fill_bg(buf, area, hi);
-                Corners(Style::default().green().not_dim()).draw(buf, area)
+                area
             },
+        };
+        if !state.focus_sequencer {
+            Corners(Style::default().green().not_dim()).draw(buf, area)?;
         }
+        Ok(area)
     }
 }