(svn r12714) -Fix [FS#1904]: do not move windows below the toolbar on resizes unless they would go behind the toolbar.

16 years ago · fd38b3f850
parent 2152e1c420
commit fd38b3f850
1 changed files with 1 additions and 1 deletions
--- 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;