Fixed issues with latest winter version

gonk/src/browser.rs

@@ -88,7 +88,7 @@ pub fn draw(
     browser: &mut Browser,
     area: winter::Rect,
     buf: &mut winter::Buffer,
-    mouse: Option<Event>,
+    mouse: Option<(u16, u16)>,
 ) {
     let size = area.width / 3;
     let rem = area.width % 3;
@@ -101,7 +101,7 @@ pub fn draw(
         Constraint::Length(size + rem)
     );
 
-    if let Some(Event::Mouse(x, y)) = mouse {
+    if let Some((x, y)) = mouse {
         let rect = Rect {
             x,
             y,
@@ -116,34 +116,29 @@ pub fn draw(
         }
     }
 
-    let artists: Vec<_> = browser.artists.iter().map(|a| text!(a)).collect();
-    let artists = lines(artists, None, None);
+    let artists: Vec<_> = browser.artists.iter().map(|a| lines!(a)).collect();
+    let albums: Vec<_> = browser.albums.iter().map(|a| lines!(&a.title)).collect();
+    let songs: Vec<_> = browser.songs.iter().map(|(s, _)| lines!(s)).collect();
 
-    let albums: Vec<_> = browser.albums.iter().map(|a| text!(&a.title)).collect();
-    let albums = lines(albums, None, None);
-
-    let songs: Vec<_> = browser.songs.iter().map(|(s, _)| text!(s)).collect();
-    let songs = lines(songs, None, None);
-
-    fn browser_list<'a>(title: &'static str, items: Lines<'a>, use_symbol: bool) -> List<'a> {
+    fn list<'a>(title: &'static str, items: Vec<Lines<'a>>, use_symbol: bool) -> List<'a> {
         let block = block(
             Some(text!(title, bold())),
             Borders::ALL,
             BorderType::Rounded,
         )
         .margin(1);
         let symbol = if use_symbol { ">" } else { " " };
-        list(Some(block), [items], Some(symbol), None)
+        winter::list(Some(block), items, Some(symbol), None)
     }
 
-    let artists = browser_list("─Aritst", artists, browser.mode == Mode::Artist);
-    let albums = browser_list("─Album", albums, browser.mode == Mode::Album);
-    let songs = browser_list("─Song", songs, browser.mode == Mode::Song);
+    let artists = list("Aritst", artists, browser.mode == Mode::Artist);
+    let albums = list("Album", albums, browser.mode == Mode::Album);
+    let songs = list("Song", songs, browser.mode == Mode::Song);
 
     //TODO: Re-work list_state and index.
-    artists.draw(chunks[0], buf, &mut list_state(browser.artists.index()));
-    albums.draw(chunks[1], buf, &mut list_state(browser.albums.index()));
-    songs.draw(chunks[2], buf, &mut list_state(browser.songs.index()));
+    artists.draw(chunks[0], buf, browser.artists.index());
+    albums.draw(chunks[1], buf, browser.albums.index());
+    songs.draw(chunks[2], buf, browser.songs.index());
 }
 
 pub fn refresh(browser: &mut Browser, db: &Database) {

gonk/src/main.rs

@@ -166,12 +166,9 @@ fn draw_log(area: Rect, buf: &mut Buffer) -> Rect {
             Constraint::Min(2),
             Constraint::Length(3)
         );
-        lines(
-            [text![msg]],
-            Some(block(None, Borders::ALL, BorderType::Rounded)),
-            None,
-        )
-        .draw(area[1], buf);
+        lines([text![msg]])
+            .block(None, Borders::ALL, BorderType::Rounded)
+            .draw(area[1], buf);
         area[0]
     } else {
         area

gonk/src/queue.rs

@@ -219,7 +219,7 @@ pub fn draw(queue: &mut Queue, area: winter::Rect, buf: &mut winter::Buffer, mou
         );
         let header = header!["", "#", "Title", "Album", "Artist"];
         let table = table(Some(header), Some(block), &con, rows, None, style());
-        table.draw(area[1], buf, &mut table_state(ui_index));
+        table.draw(area[1], buf, ui_index);
 
         let row_bounds = Some(table.get_row_bounds(ui_index, table.get_row_height(area[1])));
         row_bounds

gonk/src/settings.rs

@@ -64,9 +64,9 @@ pub fn draw<'a>(settings: &'a mut Settings, area: winter::Rect, buf: &mut winter
     let mut items = Vec::new();
     for device in &settings.devices {
         let item = if device.name == settings.current_device {
-            lines([text!(">> ", dim()), text!(&device.name)], None, None)
+            lines([text!(">> ", dim()), text!(&device.name)])
         } else {
-            lines([text!("   "), text!(&device.name)], None, None)
+            lines([text!("   "), text!(&device.name)])
         };
         items.push(item);
     }
@@ -89,5 +89,5 @@ pub fn draw<'a>(settings: &'a mut Settings, area: winter::Rect, buf: &mut winter
         None,
     );
 
-    list.draw(area, buf, &mut list_state(settings.index));
+    list.draw(area, buf, settings.index);
 }