Repaired erroneous previous commit and added check for validity of draw function...

[plomrogue] / src / windows.c

diff --git a/src/windows.c b/src/windows.c
index 389637b31b357e19bf6dfa886db749b257b944ca..080880c8fff35f766ae791b5ede7152753a93604 100644 (file)
--- a/src/windows.c
+++ b/src/windows.c
@@ -79,7 +79,7 @@ static uint8_t refit_pad(struct WinMeta * wmeta)
     }
 
     /* Only resize the pad if the rightmost window column has changed. */
-    if (getmaxx(wmeta->padframe.curses_win) != lastwincol)
+    if (getmaxx(wmeta->padframe.curses_win) + 1 != lastwincol)
     {
         if (lastwincol + 2 > UINT16_MAX)
         {
@@ -414,26 +414,18 @@ extern uint8_t init_win(struct WinMeta * wmeta, struct Win ** wp, char * title,
     {
         w->frame.size.x = width;
     }
-    else if (0 > width)
+    else if (0 >= width)
     {
         w->frame.size.x = wmeta->padframe.size.x + width;
     }
-    else
-    {
-        w->frame.size.x = wmeta->padframe.size.x;
-    }
     if      (0 < height && height <= wmeta->padframe.size.y - 1)
     {
         w->frame.size.y = height;
     }
-    else if (0 > height && wmeta->padframe.size.y + (height - 1) > 0)
+    else if (0 >= height && wmeta->padframe.size.y + (height - 1) > 0)
     {
         w->frame.size.y = wmeta->padframe.size.y + (height - 1);
     }
-    else
-    {
-        w->frame.size.y = wmeta->padframe.size.y - 1;
-    }
     *wp = w;
     return 0;
 }