cpp/openttd-patchpack/source Changeset - r370:2043e08bebf7

Changeset - r370:2043e08bebf7

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

tron - 20 years ago 2004-11-13 10:53:42
tron@openttd.org

(svn r558) -Fix: [ 1065247 ] Windows can be placed behind toolbar
While here make clamping against the screen border a bit nicer

1 file changed with 27 insertions and 1 deletions:

window.c

0 comments (0 inline, 0 general)

window.c

➞

Show inline comments

@@ @@ -698,12 +698,13 @@ bool HandleWindowDragging() @@
 	if (!_dragging_window)
 		return true;
 	// Otherwise find the window...
 	for (w = _windows; w != _last_window; w++) {
 		if (w->flags4 & WF_DRAGGING) {
 			const Widget *t = &w->widget[1]; // the title bar ... ugh
 			const Window *v;
 			int x;
 			int y;
 			int nx;
 			int ny;
@@ @@ -793,15 +794,40 @@ bool HandleWindowDragging() @@
+					}
+				}
+			}
 			// Make sure the window doesn't leave the screen
 			// 13 is the height of the title bar
-			nx = clamp(nx, 13 - w->width, _screen.width - 13);
+			nx = clamp(nx, 13 - t->right, _screen.width - 13 - t->left);
 			ny = clamp(ny, 0, _screen.height - 13);
 			// Make sure the title bar isn't hidden by behind the main tool bar
 			v = FindWindowById(WC_MAIN_TOOLBAR, 0);
 			if (v != NULL) {
 				int v_bottom = v->top + v->height;
 				int v_right = v->left + v->width;
 				if (ny + t->top >= v->top && ny + t->top < v_bottom) {
 					if (v->left < 13 && nx + t->left < v->left) {
 						ny = v_bottom;
 					} else if (v_right > _screen.width - 13 &&
 							nx + t->right > v_right) {
 						ny = v_bottom;
 					} else {
 						if (nx + t->left > v->left - 13 &&
 								nx + t->right < v_right + 13) {
 							if (w->top >= v_bottom)
 								ny = v_bottom;
 							else if (w->left < nx)
 								nx = v->left - 13 - t->left;
 							else
 								nx = v_right + 13 - t->right;
+						}
+					}
+				}
+			}
 			if (w->viewport != NULL) {
 				w->viewport->left += nx - w->left;
 				w->viewport->top  += ny - w->top;
+			}
 			w->left = nx;
 			w->top  = ny;

0 comments (0 inline, 0 general)