diff options
author | Darkvater <darkvater@openttd.org> | 2006-11-11 09:47:44 +0000 |
---|---|---|
committer | Darkvater <darkvater@openttd.org> | 2006-11-11 09:47:44 +0000 |
commit | 21db9ebb8e5692245e1e6d68a045649f6a37166a (patch) | |
tree | 9f6f4d24e777d7d99f711074a3a0df0780a58727 /window.c | |
parent | d50f6c8a8c367ebf2ef0c1a1db14d64366b2243b (diff) | |
download | openttd-21db9ebb8e5692245e1e6d68a045649f6a37166a.tar.xz |
(svn r7129) -Codechange: Get rid of a global variable that only sets a window's number.
Diffstat (limited to 'window.c')
-rw-r--r-- | window.c | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -682,12 +682,17 @@ static Window *LocalAllocateWindowDesc(const WindowDesc *desc, int window_number Point pt; Window *w; - if (desc->parent_cls != WC_MAIN_WINDOW && - (w = FindWindowById(desc->parent_cls, _alloc_wnd_parent_num), _alloc_wnd_parent_num=0, w) != NULL && - w->left < _screen.width-20 && w->left > -60 && w->top < _screen.height-20) { + /* By default position a child window at an offset of 10/10 of its parent. + * However if it falls too extremely outside window positions, reposition + * it to an automatic place */ + if (desc->parent_cls != 0 /* WC_MAIN_WINDOW */ && + (w = FindWindowById(desc->parent_cls, window_number)) != NULL && + w->left < _screen.width - 20 && w->left > -60 && w->top < _screen.height - 20) { + pt.x = w->left + 10; - if (pt.x > _screen.width + 10 - desc->width) + if (pt.x > _screen.width + 10 - desc->width) { pt.x = (_screen.width + 10 - desc->width) - 20; + } pt.y = w->top + 10; } else if (desc->cls == WC_BUILD_TOOLBAR) { // open Build Toolbars aligned /* Override the position if a toolbar is opened according to the place of the maintoolbar @@ -1715,7 +1720,7 @@ int PositionMainToolbar(Window *w) } switch (_patches.toolbar_pos) { - case 1: w->left = (_screen.width - w->width) >> 1; break; + case 1: w->left = (_screen.width - w->width) / 2; break; case 2: w->left = _screen.width - w->width; break; default: w->left = 0; } |