diff options
| author | yexo <yexo@openttd.org> | 2010-08-30 14:52:28 +0000 |
|---|---|---|
| committer | yexo <yexo@openttd.org> | 2010-08-30 14:52:28 +0000 |
| commit | 6eb3ef7bc35850eb94aa555b6bfa9608eb083a1d (patch) | |
| tree | 9655cea7f883a6a070fd13ce9365339fb4bc2fba /src/window.cpp | |
| parent | 47494b2744a6b7b76833ada2072fd9a1deafbe44 (diff) | |
| download | openttd-6eb3ef7bc35850eb94aa555b6bfa9608eb083a1d.tar.xz | |
(svn r20697) -Fix [FS#4084]: call the new function after resizing a window so it's not possible a window becomes unmoveable
Diffstat (limited to 'src/window.cpp')
| -rw-r--r-- | src/window.cpp | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/src/window.cpp b/src/window.cpp index af9c793f4..091528c11 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -1549,23 +1549,24 @@ static void EnsureVisibleCaption(Window *w, int nx, int ny) /* Search for the title bar rectangle. */ Rect caption_rect; const NWidgetBase *caption = w->nested_root->GetWidgetOfType(WWT_CAPTION); - assert(caption != NULL); - caption_rect.left = caption->pos_x; - caption_rect.right = caption->pos_x + caption->current_x; - caption_rect.top = caption->pos_y; - caption_rect.bottom = caption->pos_y + caption->current_y; + if (caption != NULL) { + caption_rect.left = caption->pos_x; + caption_rect.right = caption->pos_x + caption->current_x; + caption_rect.top = caption->pos_y; + caption_rect.bottom = caption->pos_y + caption->current_y; - /* Make sure the window doesn't leave the screen */ - nx = Clamp(nx, MIN_VISIBLE_TITLE_BAR - caption_rect.right, _screen.width - MIN_VISIBLE_TITLE_BAR - caption_rect.left); - ny = Clamp(ny, 0, _screen.height - MIN_VISIBLE_TITLE_BAR); + /* Make sure the window doesn't leave the screen */ + nx = Clamp(nx, MIN_VISIBLE_TITLE_BAR - caption_rect.right, _screen.width - MIN_VISIBLE_TITLE_BAR - caption_rect.left); + ny = Clamp(ny, 0, _screen.height - MIN_VISIBLE_TITLE_BAR); - /* Make sure the title bar isn't hidden behind the main tool bar or the status bar. */ - PreventHiding(&nx, &ny, caption_rect, FindWindowById(WC_MAIN_TOOLBAR, 0), w->left, PHD_DOWN); - PreventHiding(&nx, &ny, caption_rect, FindWindowById(WC_STATUS_BAR, 0), w->left, PHD_UP); + /* Make sure the title bar isn't hidden behind the main tool bar or the status bar. */ + PreventHiding(&nx, &ny, caption_rect, FindWindowById(WC_MAIN_TOOLBAR, 0), w->left, PHD_DOWN); + PreventHiding(&nx, &ny, caption_rect, FindWindowById(WC_STATUS_BAR, 0), w->left, PHD_UP); - if (w->viewport != NULL) { - w->viewport->left += nx - w->left; - w->viewport->top += ny - w->top; + if (w->viewport != NULL) { + w->viewport->left += nx - w->left; + w->viewport->top += ny - w->top; + } } w->left = nx; w->top = ny; @@ -1595,6 +1596,8 @@ void ResizeWindow(Window *w, int delta_x, int delta_y) w->height = w->nested_root->current_y; } + EnsureVisibleCaption(w, w->left, w->top); + /* Always call OnResize to make sure everything is initialised correctly if it needs to be. */ w->OnResize(); w->SetDirty(); |