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

(svn r22485) -Fix: EnsureVisibleCaption() did not update viewport positions of windows with viewports but without caption. (only triggerable since r22484)

release/1.2
frosch 2011-05-21 22:23:13 +00:00
parent 351c7ab097
commit 1f79304125
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/window.cpp
View File

@ -1550,12 +1550,13 @@ static void EnsureVisibleCaption(Window *w, int nx, int ny)
/* 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;
} }