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

(svn r15756) -Codechange: remove the assumption that the second windget is always the title bar. Also replace a few magic numbers with a const.

release/1.0
rubidium 2009-03-17 23:26:28 +00:00
parent c7345c6db0
commit 022a929e2d
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/window.cpp
View File

@ -1375,8 +1375,6 @@ static bool HandleWindowDragging()
Window *w; Window *w;
FOR_ALL_WINDOWS_FROM_BACK(w) { FOR_ALL_WINDOWS_FROM_BACK(w) {
if (w->flags4 & WF_DRAGGING) { if (w->flags4 & WF_DRAGGING) {
const Widget *t = &w->widget[1]; // the title bar ... ugh
/* Stop the dragging if the left mouse button was released */ /* Stop the dragging if the left mouse button was released */
if (!_left_button_down) { if (!_left_button_down) {
w->flags4 &= ~WF_DRAGGING; w->flags4 &= ~WF_DRAGGING;
@ -1466,10 +1464,18 @@ static bool HandleWindowDragging()
} }
} }
/* Make sure the window doesn't leave the screen /* Search for the title bar */
* 13 is the height of the title bar */ const Widget *t = w->widget;
nx = Clamp(nx, 13 - t->right, _screen.width - 13 - t->left); while (t->type != WWT_CAPTION && t->type != WWT_LAST) t++;
ny = Clamp(ny, 0, _screen.height - 13); assert(t->type == WWT_CAPTION);
/* The minimum number of pixels of the title bar must be visible
* in both the X or Y direction */
static const int MIN_VISIBLE_TITLE_BAR = 13;
/* Make sure the window doesn't leave the screen */
nx = Clamp(nx, MIN_VISIBLE_TITLE_BAR - t->right, _screen.width - MIN_VISIBLE_TITLE_BAR - t->left);
ny = Clamp(ny, 0, _screen.height - MIN_VISIBLE_TITLE_BAR);
/* Make sure the title bar isn't hidden by behind the main tool bar */ /* Make sure the title bar isn't hidden by behind the main tool bar */
Window *v = FindWindowById(WC_MAIN_TOOLBAR, 0); Window *v = FindWindowById(WC_MAIN_TOOLBAR, 0);
@ -1477,18 +1483,18 @@ static bool HandleWindowDragging()
int v_bottom = v->top + v->height; int v_bottom = v->top + v->height;
int v_right = v->left + v->width; int v_right = v->left + v->width;
if (ny + t->top >= v->top && ny + t->top < v_bottom) { if (ny + t->top >= v->top && ny + t->top < v_bottom) {
if ((v->left < 13 && nx + t->left < v->left) || if ((v->left < MIN_VISIBLE_TITLE_BAR && nx + t->left < v->left) ||
(v_right > _screen.width - 13 && nx + t->right > v_right)) { (v_right > _screen.width - MIN_VISIBLE_TITLE_BAR && nx + t->right > v_right)) {
ny = v_bottom; ny = v_bottom;
} else { } else {
if (nx + t->left > v->left - 13 && if (nx + t->left > v->left - MIN_VISIBLE_TITLE_BAR &&
nx + t->right < v_right + 13) { nx + t->right < v_right + MIN_VISIBLE_TITLE_BAR) {
if (w->top >= v_bottom) { if (w->top >= v_bottom) {
ny = v_bottom; ny = v_bottom;
} else if (w->left < nx) { } else if (w->left < nx) {
nx = v->left - 13 - t->left; nx = v->left - MIN_VISIBLE_TITLE_BAR - t->left;
} else { } else {
nx = v_right + 13 - t->right; nx = v_right + MIN_VISIBLE_TITLE_BAR - t->right;
} }
} }
} }