From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Thu, 23 Dec 2010 17:16:19 +0000 (+0000)
Subject: The special treatment of Alt-resize (to cause resizing to affect the
X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/commitdiff_plain/47779c35ea83c34cf95ae6849cfec3c53325a814

The special treatment of Alt-resize (to cause resizing to affect the
font instead of the terminal size) should only be active in
RESIZE_EITHER mode - in RESIZE_TERM it is worse than useless.


git-svn-id: svn://svn.tartarus.org/sgt/putty@9045 cda61777-01e9-0310-a592-d414129be87e
---

diff --git a/windows/window.c b/windows/window.c
index cd583bf0..12b6fe71 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -2627,7 +2627,8 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	 * 1) Keep the sizetip uptodate
 	 * 2) Make sure the window size is _stepped_ in units of the font size.
 	 */
-	if (cfg.resize_action != RESIZE_FONT && !is_alt_pressed()) {
+        if (cfg.resize_action == RESIZE_TERM ||
+            (cfg.resize_action == RESIZE_EITHER && !is_alt_pressed())) {
 	    int width, height, w, h, ew, eh;
 	    LPRECT r = (LPRECT) lParam;
 
@@ -2778,7 +2779,9 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
                     reset_window(0);
             } else if (wParam == SIZE_MINIMIZED) {
                 /* do nothing */
-	    } else if (cfg.resize_action != RESIZE_FONT && !is_alt_pressed()) {
+	    } else if (cfg.resize_action == RESIZE_TERM ||
+                       (cfg.resize_action == RESIZE_EITHER &&
+                        !is_alt_pressed())) {
                 w = (width-cfg.window_border*2) / font_width;
                 if (w < 1) w = 1;
                 h = (height-cfg.window_border*2) / font_height;