From d330e882525c5cbe036a811e4aa1ab9b3b45c508 Mon Sep 17 00:00:00 2001
From: unspeaker <hora.nqma@protonmail.com>
Date: Mon, 8 Sep 2025 02:03:29 +0300
Subject: [PATCH 1/2] fix(tui): bg->fg

---
 tui/src/tui_content.rs           | 2 +-
 tui/src/tui_content/tui_style.rs | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 tui/src/tui_content/tui_style.rs

diff --git a/tui/src/tui_content.rs b/tui/src/tui_content.rs
index 34d5697..184d7ea 100644
--- a/tui/src/tui_content.rs
+++ b/tui/src/tui_content.rs
@@ -63,7 +63,7 @@ impl<T: Layout<TuiOut>> Layout<TuiOut> for TuiForeground<T> {
 impl<T: Layout<TuiOut> + Draw<TuiOut>> Draw<TuiOut> for TuiForeground<T> {
     fn draw (&self, to: &mut TuiOut) {
         let area = self.layout(to.area());
-        to.fill_bg(area, self.0.0);
+        to.fill_fg(area, self.0.0);
         to.place_at(area, &self.0.1);
     }
 }
diff --git a/tui/src/tui_content/tui_style.rs b/tui/src/tui_content/tui_style.rs
deleted file mode 100644
index c7b7e81..0000000
--- a/tui/src/tui_content/tui_style.rs
+++ /dev/null
@@ -1 +0,0 @@
-use crate::*;

From c5cdbf4f0741bc5b722847769e1f3f628fb95f6b Mon Sep 17 00:00:00 2001
From: unspeaker <hora.nqma@protonmail.com>
Date: Mon, 8 Sep 2025 02:03:38 +0300
Subject: [PATCH 2/2] dsl: remove deprecated traits

---
 dsl/src/dsl.rs | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/dsl/src/dsl.rs b/dsl/src/dsl.rs
index 90cbaed..ffdf38c 100644
--- a/dsl/src/dsl.rs
+++ b/dsl/src/dsl.rs
@@ -9,7 +9,7 @@ use const_panic::PanicFmt;
 use std::fmt::Debug;
 pub(crate) use ::{
     std::sync::Arc,
-    std::error::Error,
+    //std::error::Error,
     konst::iter::for_each,
     konst::string::{str_from, str_range, char_indices},
     thiserror::Error,
@@ -225,27 +225,3 @@ pub(crate) fn ok_flat <T> (x: Option<DslPerhaps<T>>) -> DslPerhaps<T> {
         }
     }
 });
-
-#[deprecated]
-/// `T` + [Dsl] -> `Self`.
-pub trait FromDsl<T>: Sized {
-    fn from_dsl (state: &T, dsl: &impl Dsl) -> Perhaps<Self>;
-    fn from_dsl_or (state: &T, dsl: &impl Dsl, err: Box<dyn Error>) -> Usually<Self> {
-        Self::from_dsl(state, dsl)?.ok_or(err)
-    }
-    fn from_dsl_or_else (state: &T, dsl: &impl Dsl, err: impl Fn()->Box<dyn Error>) -> Usually<Self> {
-        Self::from_dsl(state, dsl)?.ok_or_else(err)
-    }
-}
-
-#[deprecated]
-/// `self` + [Dsl] -> `T`
-pub trait DslInto<T> {
-    fn dsl_into (&self, dsl: &impl Dsl) -> Perhaps<T>;
-    fn dsl_into_or (&self, dsl: &impl Dsl, err: Box<dyn Error>) -> Usually<T> {
-        self.dsl_into(dsl)?.ok_or(err)
-    }
-    fn dsl_into_or_else (&self, dsl: &impl Dsl, err: impl Fn()->Box<dyn Error>) -> Usually<T> {
-        self.dsl_into(dsl)?.ok_or_else(err)
-    }
-}