X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwlayout.c;h=0e9246eade2e02c4ca49d4b1b9c6f9947327cff8;hb=90f9791afa04690fdd044946c7369ae5c085f9b9;hp=24424662286c0accd9715fcc2503a9c141432172;hpb=d5c36d4669c2f625af7c280c5a4ebdc4ba284e95;p=xboard.git

diff --git a/winboard/wlayout.c b/winboard/wlayout.c
index 2442466..0e9246e 100644
--- a/winboard/wlayout.c
+++ b/winboard/wlayout.c
@@ -172,12 +172,20 @@ VOID ReattachAfterSize( LPRECT lprcOldPos, int new_w, int new_h, HWND hWndChild,
             int delta_y = new_h - (lprcOldPos->bottom - lprcOldPos->top);
 
             /* Adjust size & placement */
-            if(pwpChild->x + pwpChild->width  >= lprcOldPos->right  )
+            if(pwpChild->x + pwpChild->width  >= lprcOldPos->right &&
+              (pwpChild->x + pwpChild->width  < screenGeometry.right - 5 || delta_x > 0) ) // keep right edge glued to display edge if touching
 		pwpChild->width += delta_x;
-            if(pwpChild->y + pwpChild->height >= lprcOldPos->bottom )
+            if(pwpChild->x + pwpChild->width  >= screenGeometry.right  ) // don't move right edge off screen
+		pwpChild->width = screenGeometry.right - pwpChild->x;
+            if(pwpChild->y + pwpChild->height >= lprcOldPos->bottom &&
+              (pwpChild->y + pwpChild->height < screenGeometry.bottom - 35 || delta_y > 0) ) // keep bottom edge glued to display edge if touching
 		pwpChild->height += delta_y;
+            if(pwpChild->y + pwpChild->height >= screenGeometry.bottom - 30 ) // don't move bottom edge off screen
+		pwpChild->height = screenGeometry.bottom - 30 - pwpChild->y;
             if(pwpChild->x >= lprcOldPos->right)  pwpChild->width  -= delta_x, pwpChild->x += delta_x;
             if(pwpChild->y >= lprcOldPos->bottom) pwpChild->height -= delta_y, pwpChild->y += delta_y;
+            if(pwpChild->width  < 30) pwpChild->width = 30;  // force minimum width
+            if(pwpChild->height < 50) pwpChild->height = 50; // force minimum height
             /* Move window */
             if( hWndChild != NULL ) {
                 SetWindowPos( hWndChild, HWND_TOP,