Mercurial > hg > openttd
changeset 16124:1a876551f6d7 draft
(svn r20820) -Codechange: remove two more contants related to the height of the main toolbar
| author | yexo <yexo@openttd.org> |
|---|---|
| date | Fri, 17 Sep 2010 06:12:53 +0000 |
| parents | a73c48c80b5d |
| children | 4a474264f63a |
| files | src/window.cpp |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/window.cpp +++ b/src/window.cpp @@ -1053,7 +1053,8 @@ int right = width + left; int bottom = height + top; - if (left < 0 || top < 22 || right > _screen.width || bottom > _screen.height) return false; + const Window *main_toolbar = FindWindowByClass(WC_MAIN_TOOLBAR); + if (left < 0 || (main_toolbar != NULL && top < main_toolbar->height) || right > _screen.width || bottom > _screen.height) return false; /* Make sure it is not obscured by any window. */ const Window *w; @@ -1122,7 +1123,8 @@ Point pt; /* First attempt, try top-left of the screen */ - if (IsGoodAutoPlace1(0, 24, width, height, pt)) return pt; + const Window *main_toolbar = FindWindowByClass(WC_MAIN_TOOLBAR); + if (IsGoodAutoPlace1(0, main_toolbar != NULL ? main_toolbar->height + 2 : 2, width, height, pt)) return pt; /* Second attempt, try around all existing windows with a distance of 2 pixels. * The new window must be entirely on-screen, and not overlap with an existing window.