Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(svn r20697) -Fix [FS#4084]: call the new function after resizing a window so it's not possible a window becomes unmoveable

Browse Source
replace/41b28d7194a279bdc17475d4fbe2ea6ec885a466
yexo 14 years ago
parent 47494b2744
commit 6eb3ef7bc3
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File

31
src/window.cpp
Unescape Escape View File

@ -1549,23 +1549,24 @@ static void EnsureVisibleCaption(Window *w, int nx, int ny)
/* Search for the title bar rectangle. */ /* Search for the title bar rectangle. */
Rect caption_rect; Rect caption_rect;
const NWidgetBase *caption = w->nested_root->GetWidgetOfType(WWT_CAPTION); const NWidgetBase *caption = w->nested_root->GetWidgetOfType(WWT_CAPTION);
assert(caption != NULL); if (caption != NULL) {
caption_rect.left = caption->pos_x; caption_rect.left = caption->pos_x;
caption_rect.right = caption->pos_x + caption->current_x; caption_rect.right = caption->pos_x + caption->current_x;
caption_rect.top = caption->pos_y; caption_rect.top = caption->pos_y;
caption_rect.bottom = caption->pos_y + caption->current_y; caption_rect.bottom = caption->pos_y + caption->current_y;
/* Make sure the window doesn't leave the screen */ /* 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); 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); 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. */ /* 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_MAIN_TOOLBAR, 0), w->left, PHD_DOWN);
PreventHiding(&nx, &ny, caption_rect, FindWindowById(WC_STATUS_BAR, 0), w->left, PHD_UP); PreventHiding(&nx, &ny, caption_rect, FindWindowById(WC_STATUS_BAR, 0), w->left, PHD_UP);
if (w->viewport != NULL) { if (w->viewport != NULL) {
w->viewport->left += nx - w->left; w->viewport->left += nx - w->left;
w->viewport->top += ny - w->top; w->viewport->top += ny - w->top;
}
} }
w->left = nx; w->left = nx;
w->top = ny; w->top = ny;
@ -1595,6 +1596,8 @@ void ResizeWindow(Window *w, int delta_x, int delta_y)
w->height = w->nested_root->current_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. */ /* Always call OnResize to make sure everything is initialised correctly if it needs to be. */
w->OnResize(); w->OnResize();
w->SetDirty(); w->SetDirty();

Write Preview
Loading…
Cancel
Save