# HG changeset patch
# User rubidium
# Date 1208215591 0
# Node ID afe7bc9fcc6eb0b4e8e0cb578955772c7dae1958
# Parent  94ba66a68516ca3fc95430e8c697c9430c547d1d
(svn r12714) -Fix [FS#1904]: do not move windows below the toolbar on resizes unless they would go behind the toolbar.

diff -r 94ba66a68516 -r afe7bc9fcc6e src/window.cpp
--- a/src/window.cpp	Mon Apr 14 21:49:13 2008 +0000
+++ b/src/window.cpp	Mon Apr 14 23:26:31 2008 +0000
@@ -2316,7 +2316,7 @@
 
 				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;