From 4320e6f6b40af668bff4c53c91e5fa0ad558b480 Mon Sep 17 00:00:00 2001
From: unspeaker <hora.nqma@protonmail.com>
Date: Fri, 6 Sep 2024 17:39:37 +0300
Subject: [PATCH] fix: reset display size on render

---
 crates/tek_core/src/tui.rs            |  1 +
 crates/tek_core/src/tui/tui_border.rs |  1 -
 crates/tek_core/src/tui/tui_layout.rs | 27 ++++++++++-----------------
 crates/tek_sequencer/src/lib.rs       |  3 +--
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/crates/tek_core/src/tui.rs b/crates/tek_core/src/tui.rs
index f384fbca..162d1d2b 100644
--- a/crates/tek_core/src/tui.rs
+++ b/crates/tek_core/src/tui.rs
@@ -104,6 +104,7 @@ impl Tui {
                     if engine.exited() {
                         break
                     }
+                    engine.area = engine.backend.size().expect("get size failed");
                     state.render(&mut engine).expect("render failed");
                     engine.flip();
                 }
diff --git a/crates/tek_core/src/tui/tui_border.rs b/crates/tek_core/src/tui/tui_border.rs
index e9bb9b5a..4e2f9464 100644
--- a/crates/tek_core/src/tui/tui_border.rs
+++ b/crates/tek_core/src/tui/tui_border.rs
@@ -21,7 +21,6 @@ pub trait BorderStyle {
     #[inline]
     fn draw_horizontal (&self, to: &mut Tui, style: Option<Style>) -> Usually<Rect> {
         let area = to.area();
-        let buf = to.buffer();
         let style = style.or_else(||self.style_horizontal());
         for x in area.x..(area.x+area.width).saturating_sub(1) {
             self.draw_north(to, x, area.y, style)?;
diff --git a/crates/tek_core/src/tui/tui_layout.rs b/crates/tek_core/src/tui/tui_layout.rs
index e185fed7..80e9ab16 100644
--- a/crates/tek_core/src/tui/tui_layout.rs
+++ b/crates/tek_core/src/tui/tui_layout.rs
@@ -51,29 +51,22 @@ impl<'a> Render<Tui> for Split<'a, Tui> {
 
 impl<'a> Split<'a, Tui> {
     pub fn render_areas (&self, to: &mut Tui) -> Usually<(Rect, Vec<Rect>)> {
-        //Ok((Rect::default(), vec![]))
         let Rect { mut x, mut y, mut width, mut height } = to.area();
         let mut areas = vec![];
         for (index, item) in self.items.0.iter().enumerate() {
             if width == 0 || height == 0 {
                 break
             }
-            if let Some(result) = item.render(to.with_area(x, y, width, height))? {
-                match self.direction {
-                    Direction::Down => {
-                        y += result.height;
-                        height = height.saturating_sub(result.height);
-                    },
-                    Direction::Right => {
-                        x += result.width;
-                        width = width.saturating_sub(result.width);
-                    },
-                    _ => unimplemented!()
-                };
-                areas.push(result);
-                if self.focus == Some(index) {
-                    Corners(Style::default().green().not_dim()).draw(to.with_rect(result))?;
-                }
+            let result = item.render(to.with_area(x, y, width, height))?.unwrap_or(Rect::default());
+            let Rect { width: w, height: h, .. } = result;
+            match self.direction {
+                Direction::Down => { y += h; height = height.saturating_sub(h); },
+                Direction::Right => { x += w; width = width.saturating_sub(w); },
+                _ => unimplemented!()
+            };
+            areas.push(result);
+            if self.focus == Some(index) {
+                Corners(Style::default().green().not_dim()).draw(to.with_rect(result))?;
             }
         }
         Ok((to.area, areas))
diff --git a/crates/tek_sequencer/src/lib.rs b/crates/tek_sequencer/src/lib.rs
index 6805b692..cff77681 100644
--- a/crates/tek_sequencer/src/lib.rs
+++ b/crates/tek_sequencer/src/lib.rs
@@ -1,8 +1,7 @@
 /// Phrase editor.
 
 pub(crate) use tek_core::*;
-pub(crate) use tek_core::ratatui::prelude::*;
-pub(crate) use tek_core::crossterm::event::{KeyCode, KeyModifiers};
+pub(crate) use tek_core::crossterm::event::KeyCode;
 pub(crate) use tek_core::midly::{num::u7, live::LiveEvent, MidiMessage};
 pub(crate) use tek_core::jack::*;
 pub(crate) use std::sync::{Arc, RwLock};