Remove list.ha and refactor scrolllist

4 files changed, 15 insertions, 15 deletions

diff --git a/cmd/il.ha b/cmd/il.ha
index e0b5f3a..4e611da 100644
--- a/cmd/il.ha
+++ b/cmd/il.ha
@@ -80,18 +80,18 @@ export fn main() void = {
 
 	const state = tui::init()!;
 	defer tui::finish(&state);
-	//let li = list::newscrolllist(
+	//let li = list::newlist(
 	//	&state,
 	//	(1, 1),
 	//	void,
 	//	&list::DEFAULTSTYLE,
 	//	items...
 	//)!;
-	let li = list::newscrolllist(
+	let li = list::newlist(
 		&state,
 		(1, 1),
 		void,
-		&list::liststyle {
+		&list::style {
 			style = &widget::style {
 				border = border,
 			},
@@ -168,7 +168,7 @@ export fn main() void = {
 	};
 };
 
-fn search(state: *tui::tui, li: *list::scrolllist, prefix: (str | rune) = '/') (str | void) = {
+fn search(state: *tui::tui, li: *list::list, prefix: (str | rune) = '/') (str | void) = {
 	tui::unraw(state);
 	defer tui::raw(state)!;
 	fmt::fprint(state.out, prefix)!;
@@ -182,7 +182,7 @@ fn search(state: *tui::tui, li: *list::scrolllist, prefix: (str | rune) = '/') (
 	return strings::dup(strings::fromutf8(uline)!);
 };
 
-fn nextsearch(li: *list::scrolllist, term: (str | void)) void = {
+fn nextsearch(li: *list::list, term: (str | void)) void = {
 	const term = match (term) {
 	case let term: str =>
 		yield term;
@@ -197,7 +197,7 @@ fn nextsearch(li: *list::scrolllist, term: (str | void)) void = {
 	};
 };
 
-fn prevsearch(li: *list::scrolllist, term: (str | void)) void = {
+fn prevsearch(li: *list::list, term: (str | void)) void = {
 	const term = match (term) {
 	case let term: str =>
 		yield term;
diff --git a/cmd/list.ha b/cmd/list.ha
index 348083e..eacd69c 100644
--- a/cmd/list.ha
+++ b/cmd/list.ha
@@ -10,10 +10,12 @@ use time;
 export fn main() void = {
 	const state = tui::init()!;
 	defer tui::finish(&state);
-	let li = list::newlist(&state, (1, 1), void, &widget::style {
-		border = true,
-		colorfg = widget::color::REDFG,
-		colorbg = widget::color::REDBG,
+	let li = list::newlist(&state, (1, 1), void, &list::style {
+		style = &widget::style {
+			border = true,
+		},
+		normal = widget::color::REDFG,
+		marked = widget::color::BLUEBG,
 	},"hello", "world", "bye", "world")!;
 
 	let l = layout::newvlayout(&li);
diff --git a/cmd/list_nostyle.ha b/cmd/list_nostyle.ha
index 4454220..133d137 100644
--- a/cmd/list_nostyle.ha
+++ b/cmd/list_nostyle.ha
@@ -4,13 +4,12 @@ use tui::widget;
 use tui::widget::list;
 use unix::tty;
 use io;
-use fmt;
 use time;
 
 export fn main() void = {
 	const state = tui::init()!;
 	defer tui::finish(&state);
-	let li = list::newlist(&state, (1, 1), void, void,"hello", "world", "bye", "world")!;
+	let li = list::newlist(&state, (1, 1), void, &list::DEFAULTSTYLE,"hello", "world", "bye", "world")!;
 	let l = layout::newvlayout(&li);
 	l.layout.print(&l);
 };
diff --git a/cmd/list_strictsz.ha b/cmd/list_strictsz.ha
index 6802387..2396e3c 100644
--- a/cmd/list_strictsz.ha
+++ b/cmd/list_strictsz.ha
@@ -4,16 +4,15 @@ use tui::widget;
 use tui::widget::list;
 use unix::tty;
 use io;
-use fmt;
 use time;
 
 export fn main() void = {
 	const state = tui::init()!;
 	defer tui::finish(&state);
-	let li = list::newscrolllist(&state, (1, 1), tty::ttysize {
+	let li = list::newlist(&state, (1, 1), tty::ttysize {
 		rows = 3,
 		columns = 4,
-	}, &list::liststyle {
+	}, &list::style {
 		style = &widget::style {
 			border = true,
 		},