dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed handling of grid offsets in the grid drawing routine. 

2004-05-27  Sven Neumann  <sven@gimp.org>

	* app/display/gimpdisplayshell-draw.c (gimp_display_shell_draw_grid):
	fixed handling of grid offsets in the grid drawing routine.
This commit is contained in:
Sven Neumann 2004-05-27 14:51:44 +00:00 committed by Sven Neumann
parent 855eedf396
commit 4416a868d6
2 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,7 +1,12 @@
2004-05-27 Sven Neumann <sven@gimp.org>
* app/display/gimpdisplayshell-draw.c (gimp_display_shell_draw_grid):
fixed handling of grid offsets in the grid drawing routine.
2004-05-27 Michael Natterer <mitch@gimp.org> 2004-05-27 Michael Natterer <mitch@gimp.org>
* app/widgets/widgets-enums.[ch]: added enum GimpActiveColor which * app/widgets/widgets-enums.[ch]: added enum GimpActiveColor which
can be one of { FOREGROUND, BACKGROUND }, can be one of { FOREGROUND, BACKGROUND }.
* app/widgets/Makefile.am * app/widgets/Makefile.am
* app/widgets/gimpfgbgeditor.[ch]: new widget implementing the * app/widgets/gimpfgbgeditor.[ch]: new widget implementing the

41
app/display/gimpdisplayshell-draw.c
View File

@ -138,6 +138,7 @@ gimp_display_shell_draw_grid (GimpDisplayShell *shell,
gint x0, x1, x2, x3; gint x0, x1, x2, x3;
gint y0, y1, y2, y3; gint y0, y1, y2, y3;
gint x_real, y_real; gint x_real, y_real;
gint x_offset, y_offset;
gint width, height; gint width, height;
const gint length = 2; const gint length = 2;
@ -145,6 +146,8 @@ gimp_display_shell_draw_grid (GimpDisplayShell *shell,
if (! grid) if (! grid)
return; return;
g_return_if_fail (grid->xspacing > 0 && grid->yspacing > 0);
x1 = area->x; x1 = area->x;
y1 = area->y; y1 = area->y;
x2 = area->x + area->width; x2 = area->x + area->width;
@ -153,6 +156,14 @@ gimp_display_shell_draw_grid (GimpDisplayShell *shell,
width = shell->gdisp->gimage->width; width = shell->gdisp->gimage->width;
height = shell->gdisp->gimage->height; height = shell->gdisp->gimage->height;
x_offset = grid->xoffset;
while (x_offset > 0)
x_offset -= grid->xspacing;
y_offset = grid->yoffset;
while (y_offset > 0)
y_offset -= grid->yspacing;
canvas = GIMP_CANVAS (shell->canvas); canvas = GIMP_CANVAS (shell->canvas);
gimp_canvas_set_custom_gc (canvas, gimp_canvas_set_custom_gc (canvas,
@ -161,8 +172,11 @@ gimp_display_shell_draw_grid (GimpDisplayShell *shell,
switch (grid->style) switch (grid->style)
{ {
case GIMP_GRID_DOTS: case GIMP_GRID_DOTS:
for (x = grid->xoffset; x <= width; x += grid->xspacing) for (x = x_offset; x <= width; x += grid->xspacing)
{ {
if (x < 0)
continue;
gimp_display_shell_transform_xy (shell, gimp_display_shell_transform_xy (shell,
x, 0, &x_real, &y_real, x, 0, &x_real, &y_real,
FALSE); FALSE);
@ -170,8 +184,11 @@ gimp_display_shell_draw_grid (GimpDisplayShell *shell,
if (x_real < x1 || x_real >= x2) if (x_real < x1 || x_real >= x2)
continue; continue;
for (y = grid->yoffset; y <= height; y += grid->yspacing) for (y = y_offset; y <= height; y += grid->yspacing)
{ {
if (y < 0)
continue;
gimp_display_shell_transform_xy (shell, gimp_display_shell_transform_xy (shell,
x, y, &x_real, &y_real, x, y, &x_real, &y_real,
FALSE); FALSE);
@ -185,8 +202,11 @@ gimp_display_shell_draw_grid (GimpDisplayShell *shell,
break; break;
case GIMP_GRID_INTERSECTIONS: case GIMP_GRID_INTERSECTIONS:
for (x = grid->xoffset; x <= width; x += grid->xspacing) for (x = x_offset; x <= width; x += grid->xspacing)
{ {
if (x < 0)
continue;
gimp_display_shell_transform_xy (shell, gimp_display_shell_transform_xy (shell,
x, 0, &x_real, &y_real, x, 0, &x_real, &y_real,
FALSE); FALSE);
@ -194,8 +214,11 @@ gimp_display_shell_draw_grid (GimpDisplayShell *shell,
if (x_real + length < x1 || x_real - length >= x2) if (x_real + length < x1 || x_real - length >= x2)
continue; continue;
for (y = grid->yoffset; y <= height; y += grid->yspacing) for (y = y_offset; y <= height; y += grid->yspacing)
{ {
if (y < 0)
continue;
gimp_display_shell_transform_xy (shell, gimp_display_shell_transform_xy (shell,
x, y, &x_real, &y_real, x, y, &x_real, &y_real,
FALSE); FALSE);
@ -229,8 +252,11 @@ gimp_display_shell_draw_grid (GimpDisplayShell *shell,
width, height, &x3, &y3, width, height, &x3, &y3,
FALSE); FALSE);
for (x = grid->xoffset; x < width; x += grid->xspacing) for (x = x_offset; x < width; x += grid->xspacing)
{ {
if (x < 0)
continue;
gimp_display_shell_transform_xy (shell, gimp_display_shell_transform_xy (shell,
x, 0, &x_real, &y_real, x, 0, &x_real, &y_real,
FALSE); FALSE);
@ -240,8 +266,11 @@ gimp_display_shell_draw_grid (GimpDisplayShell *shell,
x_real, y0, x_real, y3 - 1); x_real, y0, x_real, y3 - 1);
} }
for (y = grid->yoffset; y < height; y += grid->yspacing) for (y = y_offset; y < height; y += grid->yspacing)
{ {
if (y < 0)
continue;
gimp_display_shell_transform_xy (shell, gimp_display_shell_transform_xy (shell,
0, y, &x_real, &y_real, 0, y, &x_real, &y_real,
FALSE); FALSE);