Refactor styles to be widget specific (except border)

1 files changed, 9 insertions, 13 deletions

diff --git a/cmd/text.ha b/cmd/text.ha
index 7c569a8..f8696ee 100644
--- a/cmd/text.ha
+++ b/cmd/text.ha
@@ -9,55 +9,51 @@ use time;
 export fn main() void = {
 	const state = tui::init()!;
 	defer tui::finish(&state);
-	let txt = text::newtext(&state, "hello world", (50, 20), &widget::style {
-		border = true,
-		colorfg = widget::color::REDFG,
-		colorbg = widget::color::REDBG,
-	});
+	let txt = text::newtext(&state, "hello world", (50, 20), &text::DEFAULTSTYLE);
 	let l = layout::newvlayout(&txt);
 	l.layout.print(&l);
 
 	//tui::clear(&state);
 
 	time::sleep(1 * time::SECOND);
-	let st = txt.widget.style as *widget::style;
-	st.colorfg = widget::color::GREENFG;
+	let st = txt.style;
+	st.normal = widget::color::GREENFG;
 	text::settext(&txt, "bye world");
 	l.layout.print(&l);
 
 	//tui::clear(&state);
 
 	time::sleep(1 * time::SECOND);
-	st.colorfg = widget::color::BROWNFG;
+	st.normal = widget::color::BROWNFG;
 	l.layout.print(&l);
 
 	//tui::clear(&state);
 
 	time::sleep(1 * time::SECOND);
-	st.colorfg = widget::color::BLUEFG;
+	st.normal = widget::color::BLUEFG;
 	l.layout.print(&l);
 
 	//tui::clear(&state);
 
 	time::sleep(1 * time::SECOND);
-	st.colorfg = widget::color::MAGENTAFG;
+	st.normal = widget::color::MAGENTAFG;
 	l.layout.print(&l);
 
 	//tui::clear(&state);
 
 	time::sleep(1 * time::SECOND);
-	st.colorfg = widget::color::CYANFG;
+	st.normal = widget::color::CYANFG;
 	l.layout.print(&l);
 
 	//tui::clear(&state);
 
 	time::sleep(1 * time::SECOND);
-	st.colorfg = widget::color::WHITEFG;
+	st.normal = widget::color::WHITEFG;
 	l.layout.print(&l);
 
 	//tui::clear(&state);
 
 	time::sleep(1 * time::SECOND);
-	st.colorfg = widget::color::DEFAULTFG;
+	st.normal = widget::color::DEFAULTFG;
 	l.layout.print(&l);
 };