dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r10967) -Fix: in case of moving the window on create (because it doesn't fit in the screen), make sure to move the viewport too if we are an extra viewport (spotted by Maedhros)

Browse Source
This commit is contained in:
truelight
2007-08-23 11:08:59 +00:00
parent dc52f2cb1b
commit ec1d0811a4
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/window.cpp
View File

@@ -693,11 +693,21 @@ static Window *LocalAllocateWindow(
w->wndproc(w, &e);
}
if (w->left + w->width > _screen.width) w->left -= (w->left + w->width - _screen.width);
int nx = w->left;
int ny = w->top;
if (nx + w->width > _screen.width) nx -= (nx + w->width - _screen.width);
const Window *wt = FindWindowById(WC_MAIN_TOOLBAR, 0);
w->top = max(w->top, (wt == NULL || w == wt || y == 0) ? 0 : wt->height);
w->left = max(w->left, 0);
ny = max(ny, (wt == NULL || w == wt || y == 0) ? 0 : wt->height);
nx = max(nx, 0);
if (w->viewport != NULL) {
w->viewport->left += nx - w->left;
w->viewport->top += ny - w->top;
}
w->left = nx;
w->top = ny;
SetWindowDirty(w);