Merge remote-tracking branch 'upstream/master' into HEAD

2022-01-31 16:18:34 +06:00
parent 279cbdbf97 7c6c96b0e7
commit 608d0200f3
2 changed files with 6 additions and 6 deletions
--- a/src/win/win_ui.c
+++ b/src/win/win_ui.c
@@ -1419,10 +1419,7 @@ ui_init(int nCmdShow)
 		scrnsz_x = fixed_size_x;
 		scrnsz_y = fixed_size_y;
 	}
-	if (hide_status_bar)
-		ResizeWindowByClientArea(hwndMain, scrnsz_x, scrnsz_y);
-	else
-		ResizeWindowByClientArea(hwndMain, scrnsz_x, scrnsz_y + sbar_height);
+	ResizeWindowByClientArea(hwnd, scrnsz_x, scrnsz_y + (hide_status_bar ? 0 : sbar_height) + (hide_tool_bar ? 0 : tbar_height));
    }

    /* Load the desired language */