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

(svn r12938) -Codechange: coding style fixes. Patch by Alberth.

release/0.7
rubidium 2008-05-04 08:56:59 +00:00
parent 5b44c68b19
commit a26b25aecc
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/window.cpp
View File

@ -918,6 +918,13 @@ restart:
/** /**
* Compute the position of the top-left corner of a new window that is opened. * Compute the position of the top-left corner of a new window that is opened.
* *
* 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
* it to an automatic place.
*
* @param *desc The pointer to the WindowDesc to be created * @param *desc The pointer to the WindowDesc to be created
* @param window_number the window number of the new window * @param window_number the window number of the new window
* *
@ -928,12 +935,6 @@ static Point LocalGetWindowPlacement(const WindowDesc *desc, int window_number)
Point pt; Point pt;
Window *w; Window *w;
/* 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
* 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) {
@ -945,33 +946,39 @@ static Point LocalGetWindowPlacement(const WindowDesc *desc, int window_number)
pt.y = w->top + ((desc->parent_cls == WC_BUILD_TOOLBAR || desc->parent_cls == WC_SCEN_LAND_GEN) ? 36 : 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
w = FindWindowById(WC_MAIN_TOOLBAR, 0); w = FindWindowById(WC_MAIN_TOOLBAR, 0);
pt.x = (w->left + w->width) - desc->default_width; pt.x = (w->left + w->width) - desc->default_width;
} break; break;
case WDP_ALIGN_TBL: /* Align the left side with the top toolbar */
case WDP_ALIGN_TBL: // Align the left side with the top toolbar
pt.x = FindWindowById(WC_MAIN_TOOLBAR, 0)->left; pt.x = FindWindowById(WC_MAIN_TOOLBAR, 0)->left;
break; break;
case WDP_AUTO: /* Find a good automatic position for the window */
case WDP_AUTO: // Find a good automatic position for the window
return GetAutoPlacePosition(desc->default_width, desc->default_height); return GetAutoPlacePosition(desc->default_width, desc->default_height);
case WDP_CENTER: /* Centre the window horizontally */
case WDP_CENTER: // Centre the window horizontally
pt.x = (_screen.width - desc->default_width) / 2; pt.x = (_screen.width - desc->default_width) / 2;
break; break;
default: default:
pt.x = desc->left; pt.x = desc->left;
if (pt.x < 0) pt.x += _screen.width; // negative is from right of the screen if (pt.x < 0) pt.x += _screen.width; // negative is from right of the screen
} }
switch (desc->top) { switch (desc->top) {
case WDP_CENTER: /* Centre the window vertically */ case WDP_CENTER: // Centre the window vertically
pt.y = (_screen.height - desc->default_height) / 2; pt.y = (_screen.height - desc->default_height) / 2;
break; break;
/* WDP_AUTO sets the position at once and is controlled by desc->left. /* WDP_AUTO sets the position at once and is controlled by desc->left.
* Both left and top must be set to WDP_AUTO */ * Both left and top must be set to WDP_AUTO */
case WDP_AUTO: case WDP_AUTO:
NOT_REACHED(); NOT_REACHED();
assert(desc->left == WDP_AUTO && desc->top != WDP_AUTO); assert(desc->left == WDP_AUTO && desc->top != WDP_AUTO);
/* fallthrough */ /* fallthrough */
default: default:
pt.y = desc->top; pt.y = desc->top;
if (pt.y < 0) pt.y += _screen.height; // negative is from bottom of the screen if (pt.y < 0) pt.y += _screen.height; // negative is from bottom of the screen