gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-01 20:03:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r20820) -Codechange: remove two more contants related to the height of the main toolbar

Browse Source
This commit is contained in:
yexo 2010-09-17 06:12:53 +00:00
parent 97dbb1f27d
commit 6b35ad3f0b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/window.cpp
View File

@ -1053,7 +1053,8 @@ static bool IsGoodAutoPlace1(int left, int top, int width, int height, Point &po
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 @@ static Point GetAutoPlacePosition(int width, int height)
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.