(w32_wnd_proc): Force non-tooltip frames to respect the minimum tracking size.

Remove non-working old hack to do the same.

2 files changed, 10 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 77a714e0917..36f9d88f9f4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * w32fns.c (w32_wnd_proc): Force non-tooltip frames to respect the
+        minimum tracking size.  Remove non-working old hack to do the same.
+
 2006-12-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * emacs.c (handle_user_signal): Move function to keyboard.c.
diff --git a/src/w32fns.c b/src/w32fns.c
index 6313afe7867..96fa9375ee8 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -3706,8 +3706,11 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
                    However for top/left sizing we will need to fix the X
                    and Y positions as well.  */
 
-                lppos->cx -= wdiff;
-                lppos->cy -= hdiff;
+                int cx_mintrack = GetSystemMetrics (SM_CXMINTRACK);
+                int cy_mintrack = GetSystemMetrics (SM_CYMINTRACK);
+
+                lppos->cx = max (lppos->cx - wdiff, cx_mintrack);
+                lppos->cy = max (lppos->cy - hdiff, cy_mintrack);
 
                 if (wp.showCmd != SW_SHOWMAXIMIZED
                     && (lppos->flags & SWP_NOMOVE) == 0)
@@ -3731,9 +3734,6 @@ w32_wnd_proc (hwnd, msg, wParam, lParam)
       goto dflt;
 
     case WM_GETMINMAXINFO:
-      /* Hack to correct bug that allows Emacs frames to be resized
-         below the Minimum Tracking Size.  */
-      ((LPMINMAXINFO) lParam)->ptMinTrackSize.y++;
       /* Hack to allow resizing the Emacs frame above the screen size.
          Note that Windows 9x limits coordinates to 16-bits.  */
       ((LPMINMAXINFO) lParam)->ptMaxTrackSize.x = 32767;