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

(svn r23466) -Fix [FS#4871, FS#4874]: assertion triggered when resizing a window during ReInit by an amount that's not a multiple of the resize interval

release/1.2
rubidium 2011-12-09 22:07:00 +00:00
parent dcba6c25ea
commit 6153dc57f5
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/math_func.hpp
View File

@ -329,6 +329,17 @@ static FORCEINLINE uint CeilDiv(uint a, uint b)
return (a + b - 1) / b; return (a + b - 1) / b;
} }
/**
* Computes ceil(a / b) * b for non-negative a and b.
* @param a Numerator
* @param b Denominator
* @return a rounded up to the nearest multiple of b.
*/
static FORCEINLINE uint Ceil(uint a, uint b)
{
return CeilDiv(a, b) * b;
}
/** /**
* Computes round(a / b) for signed a and unsigned b. * Computes round(a / b) for signed a and unsigned b.
* @param a Numerator * @param a Numerator

4
src/window.cpp
View File

@ -1675,8 +1675,8 @@ void ResizeWindow(Window *w, int delta_x, int delta_y)
* the resolution clamp it in such a manner that it stays within the bounts. */ * the resolution clamp it in such a manner that it stays within the bounts. */
int new_right = w->left + w->width + delta_x; int new_right = w->left + w->width + delta_x;
int new_bottom = w->top + w->height + delta_y; int new_bottom = w->top + w->height + delta_y;
if (new_right >= (int)_cur_resolution.width) delta_x -= new_right - _cur_resolution.width; if (new_right >= (int)_cur_resolution.width) delta_x -= Ceil(new_right - _cur_resolution.width, max(1U, w->nested_root->resize_x));
if (new_bottom >= (int)_cur_resolution.height) delta_y -= new_bottom - _cur_resolution.height; if (new_bottom >= (int)_cur_resolution.height) delta_y -= Ceil(new_bottom - _cur_resolution.height, max(1U, w->nested_root->resize_y));
w->SetDirty(); w->SetDirty();