X-Git-Url: https://git.danieliu.xyz/?p=taskasaur.git;a=blobdiff_plain;f=render.c;fp=render.c;h=4601ce9c99dfa87de7ce60028ba5c3d362f1b98f;hp=2f9261c5b7798f9859ef696340a9c50fd0be3a59;hb=0b8a464220518abd203044984daaed9727a5029d;hpb=cc7da4297912fa4cacc4b13ebc59223df415a116

diff --git a/render.c b/render.c
index 2f9261c..4601ce9 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);
 
@@ -85,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;
@@ -301,43 +306,58 @@ 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;
-    WINDOW* popup_win;
+    Menu* popupmenu_menu;
+    WINDOW* popupmenu_win;
+    WINDOW* popupmenu_menu_win;
+
+    new_popupmenu = malloc(sizeof(PopupMenu));
 
     subtask_menuitems = subtasklist_to_menuitem(itemdata->subtask_list, itemdata->subtask_count);
-    new_popup_menu = create_menu(strdup(""), subtask_menuitems);
+    popupmenu_menu = create_menu(strdup(""), subtask_menuitems);
 
     /* popup win */
     int maxheight, maxwidth;
     getmaxyx(stdscr, maxheight, maxwidth);
-    popup_win = newwin(
+    popupmenu_win = newwin(
         maxheight-2*POPUP_BORDER,
         maxwidth-2*2*POPUP_BORDER,
         POPUP_BORDER,
         POPUP_BORDER*2
     );
 
-    set_menu_win(new_popup_menu, popup_win);
-    set_menu_focus(new_popup_menu, 1);
+    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);
+    box(popupmenu_menu_win, 0, 0);
 
-    return new_popup_menu;
+    /* don't forget to free popupmenu after */
+    new_popupmenu->win = popupmenu_win;
+    new_popupmenu->menu = popupmenu_menu;
+
+    return new_popupmenu;
 }
 
 int
-render_popup_menu(Menu* popup_menu)
+render_popupmenu(PopupMenu* popupmenu)
 {
-    WINDOW* popup_win;
-
-    popup_win = get_menu_win(popup_menu);
-    wclear(popup_win);
-
-    render_menu(popup_menu);
+    render_menu(popupmenu->menu);
 
-    wrefresh(popup_win);
+    wrefresh(popupmenu->win);
 
     return 0;
 }