From fd38b3f850863a3e4010bccd6cbab5e5b8cec0c1 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Mon, 14 Apr 2008 23:26:31 +0000
Subject: [PATCH] (svn r12714) -Fix [FS#1904]: do not move windows below the
 toolbar on resizes unless they would go behind the toolbar.

---
 src/window.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/window.cpp b/src/window.cpp
index ac5ec8022e..976155644b 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -2316,7 +2316,7 @@ void RelocateAllWindows(int neww, int newh)
 
 				const Window *wt = FindWindowById(WC_MAIN_TOOLBAR, 0);
 				if (wt != NULL) {
-					if (top < wt->height) top = wt->height;
+					if (top < wt->height && wt->left < (w->left + w->width) && (wt->left + wt->width) > w->left) top = wt->height;
 					if (top >= newh) top = newh - 1;
 				} else {
 					if (top < 0) top = 0;