X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=render.c;h=71d675e1385c33f919ebe0427fbbd72bf18fae05;hb=dd1e302d132c07167c4a9b9d1803918d599a72ab;hp=33cd48b1fa7438aea5c4fa644f3e00e1dabec288;hpb=fc9d31162f04dd3ceb2d222e3aa81549095f767b;p=taskasaur.git

diff --git a/render.c b/render.c
index 33cd48b..71d675e 100644
--- a/render.c
+++ b/render.c
@@ -3,6 +3,11 @@
 #include <string.h>
 #include "config.h"
 
+#define POPUP_MENU_PAD_TOP 2
+#define POPUP_MENU_PAD_BOTTOM 2
+#define POPUP_MENU_PAD_LEFT 2
+#define POPUP_MENU_PAD_RIGHT 1
+
 int init_tscolors(void);
 int create_todowin(void);
 
@@ -45,6 +50,7 @@ init_tscolors(void)
     init_pair(TS_NONSELECTED, non_selected_color, COLOR_BLACK);
     init_pair(TS_MENU_SELECTED, menu_selected_color, COLOR_BLACK);
     init_pair(TS_MENU_NONSELECTED, menu_non_selected_color, COLOR_BLACK);
+    init_pair(TS_ITEMCOUNT, item_count_color, COLOR_BLACK);
 
     return 0;
 }
@@ -84,7 +90,7 @@ create_board_menu(Board* board)
     new_boardmenu->menu_list = make_menus(board, board->todolist_count);
     new_boardmenu->menu_count = board->todolist_count;
     new_boardmenu->selected = 0;
-    new_boardmenu->popup_menu = NULL;
+    new_boardmenu->popupmenu = NULL;
     new_boardmenu->popup_open = 0;
 
     return new_boardmenu;
@@ -197,6 +203,13 @@ boardmenu_to_board(BoardMenu* boardmenu)
     return newboard;
 }
 
+int
+render_board(Board* board)
+{
+
+    return 0;
+}
+
 int
 set_selected_menu(BoardMenu* boardmenu, int index)
 {
@@ -293,38 +306,61 @@ update_menuitem_descrip(MenuItem* menuitem)
 }
 
 /* popup */
-Menu*
-make_popup_menu(TodoItem* itemdata)
+PopupMenu*
+make_popupmenu(TodoItem* itemdata)
 {
+    PopupMenu* new_popupmenu;
     MenuItem** subtask_menuitems;
-    Menu* new_popup_menu;
+    Menu* popupmenu_menu;
+    WINDOW* popupmenu_win;
+    WINDOW* popupmenu_menu_win;
 
-    /* subtask list */
-    subtask_menuitems = subtasklist_to_menuitem(itemdata->subtask_list, itemdata->subtask_count);
-    new_popup_menu = create_menu(strdup(""), subtask_menuitems);
+    new_popupmenu = malloc(sizeof(PopupMenu));
 
-    return new_popup_menu;
-}
+    subtask_menuitems = subtasklist_to_menuitem(itemdata->subtask_list, itemdata->subtask_count);
+    popupmenu_menu = create_menu(strdup(""), subtask_menuitems);
 
-WINDOW*
-create_popup_win(TodoItem* item_info)
-{
+    /* popup win */
     int maxheight, maxwidth;
-    WINDOW* popup_win;
-
     getmaxyx(stdscr, maxheight, maxwidth);
-    popup_win = newwin(
+    popupmenu_win = newwin(
         maxheight-2*POPUP_BORDER,
         maxwidth-2*2*POPUP_BORDER,
         POPUP_BORDER,
         POPUP_BORDER*2
     );
-    box(popup_win, 0, 0);
-    
-    refresh();
-    wrefresh(popup_win);
 
-    return popup_win;
+    int popup_maxheight, popup_maxwidth;
+    getmaxyx(popupmenu_win, popup_maxheight, popup_maxwidth);
+    popupmenu_menu_win = derwin(
+        popupmenu_win,
+        popup_maxheight-POPUP_MENU_PAD_TOP-POPUP_MENU_PAD_BOTTOM,
+        popup_maxwidth-POPUP_MENU_PAD_LEFT-POPUP_MENU_PAD_RIGHT,
+        POPUP_MENU_PAD_TOP,
+        POPUP_MENU_PAD_LEFT
+    );
+
+    set_menu_win(popupmenu_menu, popupmenu_menu_win);
+    set_menu_focus(popupmenu_menu, 1);
+    box(popupmenu_win, 0, 0);
+
+    /* move this stuff to render phase later? */
+    mvwprintw(popupmenu_win, 1, 2, itemdata->item_name);
+
+    /* don't forget to free popupmenu after */
+    new_popupmenu->win = popupmenu_win;
+    new_popupmenu->menu = popupmenu_menu;
+
+    return new_popupmenu;
+}
+
+int
+render_popupmenu(PopupMenu* popupmenu)
+{
+    render_menu(popupmenu->menu);
+    wrefresh(popupmenu->win);
+
+    return 0;
 }
 
 /* this is copy paste of other, prob abstract */