mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r11256) -Codechange: Make opening a new toolbar not overlapping its parent one, by locating it under the parent, and aligned with the left side of it. 

FS#1310, by BigBB
release/0.6
belugas 2007-10-14 00:26:24 +00:00
parent d47e51c246
commit c78c96a8ad
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/window.cpp
View File

@ -843,23 +843,35 @@ restart:
} }
} }
/**
* Set the x and y coordinates of a new window.
*
* @param *desc The pointer to the WindowDesc to be created
* @param window_number the window number of the new window
* @param data arbitrary data that is send with the WE_CREATE message
*
* @return see Window pointer of the newly created window
*/
static Window *LocalAllocateWindowDesc(const WindowDesc *desc, int window_number, void *data) static Window *LocalAllocateWindowDesc(const WindowDesc *desc, int window_number, void *data)
{ {
Point pt; Point pt;
Window *w; Window *w;
/* By default position a child window at an offset of 10/10 of its parent. /* By default position a child window at an offset of 10/10 of its parent.
* With the exception of WC_BUILD_TOOLBAR (build railway/roads/ship docks/airports)
* and WC_SCEN_LAND_GEN (landscaping). Whose child window has an offset of 0/36 of
* its parent. So it's exactly under the parent toolbar and no buttons will be covered.
* However if it falls too extremely outside window positions, reposition * However if it falls too extremely outside window positions, reposition
* it to an automatic place */ * it to an automatic place */
if (desc->parent_cls != 0 /* WC_MAIN_WINDOW */ && if (desc->parent_cls != 0 /* WC_MAIN_WINDOW */ &&
(w = FindWindowById(desc->parent_cls, window_number)) != NULL && (w = FindWindowById(desc->parent_cls, window_number)) != NULL &&
w->left < _screen.width - 20 && w->left > -60 && w->top < _screen.height - 20) { w->left < _screen.width - 20 && w->left > -60 && w->top < _screen.height - 20) {
pt.x = w->left + 10; pt.x = w->left + ((desc->parent_cls == WC_BUILD_TOOLBAR || desc->parent_cls == WC_SCEN_LAND_GEN) ? 0 : 10);
if (pt.x > _screen.width + 10 - desc->default_width) { if (pt.x > _screen.width + 10 - desc->default_width) {
pt.x = (_screen.width + 10 - desc->default_width) - 20; pt.x = (_screen.width + 10 - desc->default_width) - 20;
} }
pt.y = w->top + 10; pt.y = w->top + ((desc->parent_cls == WC_BUILD_TOOLBAR || desc->parent_cls == WC_SCEN_LAND_GEN) ? 36 : 10);
} else { } else {
switch (desc->left) { switch (desc->left) {
case WDP_ALIGN_TBR: { /* Align the right side with the top toolbar */ case WDP_ALIGN_TBR: { /* Align the right side with the top toolbar */