From 1ab1b695a4b1e9a3dc4b5e1b39a15666195b2c69 Mon Sep 17 00:00:00 2001
From: unspeaker <hora.nqma@protonmail.com>
Date: Sat, 2 Nov 2024 20:57:50 +0200
Subject: [PATCH] remove final instance of tui_style!

---
 crates/tek_core/src/tui.rs      |  7 -------
 crates/tek_sequencer/src/lib.rs | 10 +++++++---
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/crates/tek_core/src/tui.rs b/crates/tek_core/src/tui.rs
index e2700813..a87a2589 100644
--- a/crates/tek_core/src/tui.rs
+++ b/crates/tek_core/src/tui.rs
@@ -421,13 +421,6 @@ impl Widget for Styled<&str> {
     }
 }
 
-#[macro_export] macro_rules! tui_style {
-    ($NAME:ident = $fg:expr, $bg:expr, $ul:expr, $add:expr, $sub:expr) => {
-        pub const $NAME: Style = Style {
-            fg: $fg, bg: $bg, underline_color: $ul, add_modifier: $add, sub_modifier: $sub,
-        };
-    }
-}
 pub trait TuiStyle: Widget<Engine = Tui> + Sized {
     fn fg (self, color: Color) -> impl Widget<Engine = Tui> {
         Layers::new(move |add|{ add(&Foreground(color))?; add(&self) })
diff --git a/crates/tek_sequencer/src/lib.rs b/crates/tek_sequencer/src/lib.rs
index d8681f02..ceb4ec9f 100644
--- a/crates/tek_sequencer/src/lib.rs
+++ b/crates/tek_sequencer/src/lib.rs
@@ -15,9 +15,13 @@ submod! {
 /// FIXME: use PPQ value from global timebase
 pub const PPQ: usize = 96;
 
-pub const CORNERS: CornersTall = CornersTall(CORNERS_STYLE);
-tui_style!(CORNERS_STYLE =
-    Some(Color::Rgb(96, 255, 32)), None, None, Modifier::empty(), Modifier::DIM);
+pub const CORNERS: CornersTall = CornersTall(Style {
+    fg: Some(Color::Rgb(96, 255, 32)),
+    bg: None,
+    underline_color: None,
+    add_modifier: Modifier::empty(),
+    sub_modifier: Modifier::DIM
+});
 
 /// Octave number (from -1 to 9)
 pub const NTH_OCTAVE: [&'static str;11] = [