make tab ui a little more pretty

2 files changed, 20 insertions, 8 deletions

diff --git a/src/ui.rs b/src/ui.rs
index fc5c76d..dcfd5a5 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -213,15 +213,27 @@ pub fn wprint_file_info(win: ncurses::WINDOW, file: &structs::JoshutoDirEntry) {
 
 pub fn redraw_tab_view(win: &window::JoshutoPanel, context: &JoshutoContext) {
     let tab_len = context.tabs.len();
+    ncurses::werase(win.win);
     if tab_len == 1 {
-        ncurses::werase(win.win);
-    } else {
+    } else if tab_len >= 6 {
         ncurses::wmove(win.win, 0, 0);
         ncurses::wattron(win.win, ncurses::A_BOLD());
-        ncurses::waddstr(
-            win.win,
-            format!("{} {}", context.curr_tab_index + 1, tab_len).as_str(),
-        );
+        ncurses::wattron(win.win, ncurses::A_STANDOUT());
+        ncurses::waddstr(win.win, &format!("{}", context.curr_tab_index + 1));
+        ncurses::wattroff(win.win, ncurses::A_STANDOUT());
+        ncurses::waddstr(win.win, &format!(" {}", tab_len));
+        ncurses::wattroff(win.win, ncurses::A_BOLD());
+    } else {
+        ncurses::wattron(win.win, ncurses::A_BOLD());
+        for i in 0..tab_len {
+            if i == context.curr_tab_index {
+                ncurses::wattron(win.win, ncurses::A_STANDOUT());
+                ncurses::waddstr(win.win, &format!("{} ", i+1));
+                ncurses::wattroff(win.win, ncurses::A_STANDOUT());
+            } else {
+                ncurses::waddstr(win.win, &format!("{} ", i+1));
+            }
+        }
         ncurses::wattroff(win.win, ncurses::A_BOLD());
     }
     ncurses::wnoutrefresh(win.win);
diff --git a/src/window/view.rs b/src/window/view.rs
index ead7f0d..bb8a18f 100644
--- a/src/window/view.rs
+++ b/src/window/view.rs
@@ -26,8 +26,8 @@ impl JoshutoView {
         let win_coord: (usize, usize) = (0, 0);
         let top_win = JoshutoPanel::new(win_xy.0, win_xy.1, win_coord);
 
-        let win_xy: (i32, i32) = (1, 5);
-        let win_coord: (usize, usize) = (0, term_cols as usize - 5);
+        let win_xy: (i32, i32) = (1, 10);
+        let win_coord: (usize, usize) = (0, term_cols as usize - win_xy.1 as usize);
         let tab_win = JoshutoPanel::new(win_xy.0, win_xy.1, win_coord);
 
         let win_xy: (i32, i32) = (term_rows - 2, (term_divide * win_ratio.0 as i32) - 1);