X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwlayout.c;h=c308fb333ee9cba7743a5f695c5c98faa8da06cf;hb=HEAD;hp=0261736f8f980c8171da0d7a37d2d7663f0d8baa;hpb=d413d3ed517beac460ae9ed147e6200a57125bb5;p=xboard.git

diff --git a/winboard/wlayout.c b/winboard/wlayout.c
index 0261736..c308fb3 100644
--- a/winboard/wlayout.c
+++ b/winboard/wlayout.c
@@ -3,6 +3,11 @@
  *
  * Author: Alessandro Scotti (Dec 2005)
  *
+ * Copyright 2005 Alessandro Scotti
+ *
+ * Enhancements Copyright 2009, 2012, 2013, 2014, 2015, 2016 Free
+ * Software Foundation, Inc.
+ *
  * ------------------------------------------------------------------------
  *
  * GNU XBoard is free software: you can redistribute it and/or modify
@@ -31,6 +36,7 @@
 #include <dlgs.h>
 
 #include "common.h"
+#include "frontend.h"
 #include "winboard.h"
 
 VOID RestoreWindowPlacement( HWND hWnd, WindowPlacement * wp )
@@ -91,7 +97,7 @@ static BOOL IsDefaultPlacement( WindowPlacement * wp )
     return result;
 }
 
-static BOOL GetActualPlacement( HWND hWnd, WindowPlacement * wp )
+BOOL GetActualPlacement( HWND hWnd, WindowPlacement * wp )
 {
     BOOL result = FALSE;
 
@@ -163,20 +169,26 @@ VOID ReattachAfterSize( LPRECT lprcOldPos, int new_w, int new_h, HWND hWndChild,
     if( ! IsDefaultPlacement( pwpChild ) ) {
         GetActualPlacement( hWndChild, pwpChild );
 
-if(appData.debugMode) fprintf(debugFP, "resize, old=(%d,%d,%d,%d), new=(%d,%d)\n",
-lprcOldPos->left,lprcOldPos->top,lprcOldPos->right,lprcOldPos->bottom,new_w,new_h);
         if( IsAttachedByWindowPlacement( lprcOldPos, pwpChild ) ) {
             /* Get delta of lower right corner */
             int delta_x = new_w - (lprcOldPos->right  - lprcOldPos->left);
             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,