(svn r22484) -Fix: The caption of centered windows could be moved out of the main window and thus become inaccessible when resizing the main window.

1 files changed, 1 insertions, 15 deletions

diff --git a/src/window.cpp b/src/window.cpp
index b167cbb78..572be9f37 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -2801,25 +2801,11 @@ void RelocateAllWindows(int neww, int newh)
 
 				top = w->top;
 				if (top + (w->height >> 1) >= newh) top = newh - w->height;
-
-				const Window *wt = FindWindowById(WC_MAIN_TOOLBAR, 0);
-				if (wt != NULL) {
-					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;
-				}
 				break;
 			}
 		}
 
-		if (w->viewport != NULL) {
-			w->viewport->left += left - w->left;
-			w->viewport->top += top - w->top;
-		}
-
-		w->left = left;
-		w->top = top;
+		EnsureVisibleCaption(w, left, top);
 	}
 }