branch | 0.6 |
changeset 10328 | 721fe18a2176 |
parent 9194 | 685d482d1e6c |
--- a/src/window.cpp Thu Apr 24 12:32:37 2008 +0000 +++ b/src/window.cpp Thu Apr 24 12:36:18 2008 +0000 @@ -2185,7 +2185,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;