(svn r12371) -Fix [FS#1823]: do not let window hide behind the main toolbar after resizing the screen

1 files changed, 10 insertions, 3 deletions

diff --git a/src/window.cpp b/src/window.cpp
index 82b6ced25..035d2bf92 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -2175,15 +2175,22 @@ void RelocateAllWindows(int neww, int newh)
 				IConsoleResize(w);
 				continue;
 
-			default:
+			default: {
 				left = w->left;
 				if (left + (w->width >> 1) >= neww) left = neww - w->width;
 				if (left < 0) left = 0;
 
 				top = w->top;
 				if (top + (w->height >> 1) >= newh) top = newh - w->height;
-				if (top < 0) top = 0;
-				break;
+
+				const Window *wt = FindWindowById(WC_MAIN_TOOLBAR, 0);
+				if (wt != NULL) {
+					if (top < wt->height) top = wt->height;
+					if (top >= newh) top = newh - 1;
+				} else {
+					if (top < 0) top = 0;
+				}
+			} break;
 		}
 
 		if (w->viewport != NULL) {