ref: f2e74bd09138f87f0f42a7bf38c2833848fefa19
parent: ee059bc60c6e21077739279a7b8dd0aa28c74e76
author: Simon Tatham <anakin@pobox.com>
date: Fri Jun 10 09:05:24 EDT 2005
Clean up the behaviour of drags off the edge of the grid. These have always been a convenient way to cancel a drag you decided was an error, but now it's more obvious that this is the case. [originally from svn r5941]
--- a/rect.c
+++ b/rect.c
@@ -2138,11 +2138,11 @@
/* Vertical edge: x-coord of corner,
* y-coord of square centre. */
*xr = 2 * (int)xv;
- *yr = 1 + 2 * (int)ys;
+ *yr = 1 + 2 * (int)floor(ys);
} else {/* Horizontal edge: x-coord of square centre,
* y-coord of corner. */
- *xr = 1 + 2 * (int)xs;
+ *xr = 1 + 2 * (int)floor(xs);
*yr = 2 * (int)yv;
}
}
@@ -2233,19 +2233,26 @@
ui->dragged = TRUE;
active = TRUE;
- ui->x1 = ui->drag_start_x;
- ui->x2 = ui->drag_end_x;
- if (ui->x2 < ui->x1) { t = ui->x1; ui->x1 = ui->x2; ui->x2 = t; }+ if (xc >= 0 && xc <= 2*from->w &&
+ yc >= 0 && yc <= 2*from->h) {+ ui->x1 = ui->drag_start_x;
+ ui->x2 = ui->drag_end_x;
+ if (ui->x2 < ui->x1) { t = ui->x1; ui->x1 = ui->x2; ui->x2 = t; }- ui->y1 = ui->drag_start_y;
- ui->y2 = ui->drag_end_y;
- if (ui->y2 < ui->y1) { t = ui->y1; ui->y1 = ui->y2; ui->y2 = t; }+ ui->y1 = ui->drag_start_y;
+ ui->y2 = ui->drag_end_y;
+ if (ui->y2 < ui->y1) { t = ui->y1; ui->y1 = ui->y2; ui->y2 = t; }- ui->x1 = ui->x1 / 2; /* rounds down */
- ui->x2 = (ui->x2+1) / 2; /* rounds up */
- ui->y1 = ui->y1 / 2; /* rounds down */
- ui->y2 = (ui->y2+1) / 2; /* rounds up */
-
+ ui->x1 = ui->x1 / 2; /* rounds down */
+ ui->x2 = (ui->x2+1) / 2; /* rounds up */
+ ui->y1 = ui->y1 / 2; /* rounds down */
+ ui->y2 = (ui->y2+1) / 2; /* rounds up */
+ } else {+ ui->x1 = -1;
+ ui->y1 = -1;
+ ui->x2 = -1;
+ ui->y2 = -1;
+ }
}
ret = NULL;