On Fri, 2007-05-25 at 13:05 +0100, Peter Clifton wrote:
> Please Apply!
Version with fixed indenting (no mixed tabs this function, and I think
now GNU indent style on the new if statement).
Index: src/hid/gtk/gtkhid-main.c
===================================================================
RCS file: /cvsroot/pcb/pcb/src/hid/gtk/gtkhid-main.c,v
retrieving revision 1.39
diff -U3 -p -r1.39 gtkhid-main.c
--- src/hid/gtk/gtkhid-main.c 1 May 2007 03:29:33 -0000 1.39
+++ src/hid/gtk/gtkhid-main.c 25 May 2007 12:24:10 -0000
@@ -1003,7 +1003,7 @@ ghid_fill_polygon (hidGC gc, int n_coord
void
ghid_fill_rect (hidGC gc, int x1, int y1, int x2, int y2)
{
- gint w, h, lw, xx;
+ gint w, h, lw, xx, yy;
lw = gc->width;
w = gport->width * gport->zoom;
@@ -1012,11 +1012,11 @@ ghid_fill_rect (hidGC gc, int x1, int y1
if ((SIDE_X (x1) < gport->view_x0 - lw
&& SIDE_X (x2) < gport->view_x0 - lw)
|| (SIDE_X (x1) > gport->view_x0 + w + lw
- && SIDE_X (x2) > gport->view_x0 + w + lw)
- || (SIDE_Y (y1) < gport->view_y0 - lw
- && SIDE_Y (y2) < gport->view_y0 - lw)
- || (SIDE_Y (y1) > gport->view_y0 + h + lw
- && SIDE_Y (y2) > gport->view_y0 + h + lw))
+ && SIDE_X (x2) > gport->view_x0 + w + lw)
+ || (SIDE_Y (y1) < gport->view_y0 - lw
+ && SIDE_Y (y2) < gport->view_y0 - lw)
+ || (SIDE_Y (y1) > gport->view_y0 + h + lw
+ && SIDE_Y (y2) > gport->view_y0 + h + lw))
return;
x1 = Vx (x1);
@@ -1025,13 +1025,19 @@ ghid_fill_rect (hidGC gc, int x1, int y1
y2 = Vy (y2);
if (x2 < x1)
{
- xx = x1;
- x1 = x2;
- x2 = xx;
- }
+ xx = x1;
+ x1 = x2;
+ x2 = xx;
+ }
+ if (y2 < y1)
+ {
+ yy = y1;
+ y1 = y2;
+ y2 = yy;
+ }
USE_GC (gc);
gdk_draw_rectangle (gport->drawable, gport->u_gc, TRUE,
- x1, y1, x2 - x1 + 1, y2 - y1 + 1);
+ x1, y1, x2 - x1 + 1, y2 - y1 + 1);
}
void
_______________________________________________
geda-dev mailing list
[email protected]
http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev
