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

app: restrict sample point drawing to the exposed region 

With the same limitation as for guides in the last commit.
This commit is contained in:
Michael Natterer 2010-05-02 15:58:51 +02:00
parent 6e4be79bef
commit 02b8eea086
4 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/display/gimpdisplayshell-callbacks.c
View File

@ -2281,7 +2281,7 @@ gimp_display_shell_canvas_expose_image (GimpDisplayShell *shell,
gimp_display_shell_draw_guides (shell, eevent->region);
/* draw the sample points */
gimp_display_shell_draw_sample_points (shell);
gimp_display_shell_draw_sample_points (shell, eevent->region);
/* and the cursor (if we have a software cursor) */
gimp_display_shell_draw_cursor (shell);

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

@ -432,9 +432,10 @@ gimp_display_shell_draw_pen (GimpDisplayShell *shell,
}
void
gimp_display_shell_draw_sample_point (GimpDisplayShell *shell,
GimpSamplePoint *sample_point,
gboolean active)
gimp_display_shell_draw_sample_point (GimpDisplayShell *shell,
GimpSamplePoint *sample_point,
const GdkRectangle *area,
gboolean active)
{
GimpImage *image;
GimpCanvasStyle style;
@ -469,6 +470,12 @@ gimp_display_shell_draw_sample_point (GimpDisplayShell *shell,
y > h + GIMP_SAMPLE_POINT_DRAW_SIZE)
return;
if (area && (x + GIMP_SAMPLE_POINT_DRAW_SIZE < area->x ||
y + GIMP_SAMPLE_POINT_DRAW_SIZE < area->y ||
x - GIMP_SAMPLE_POINT_DRAW_SIZE >= area->x + area->width ||
y - GIMP_SAMPLE_POINT_DRAW_SIZE >= area->y + area->height))
return;
if (active)
style = GIMP_CANVAS_STYLE_SAMPLE_POINT_ACTIVE;
else
@ -501,23 +508,31 @@ gimp_display_shell_draw_sample_point (GimpDisplayShell *shell,
}
void
gimp_display_shell_draw_sample_points (GimpDisplayShell *shell)
gimp_display_shell_draw_sample_points (GimpDisplayShell *shell,
const GdkRegion *region)
{
GimpImage *image;
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_return_if_fail (region != NULL);
image = gimp_display_get_image (shell->display);
if (image && gimp_display_shell_get_show_sample_points (shell))
{
GList *list;
GdkRectangle area;
GList *list;
if (region)
gdk_region_get_clipbox (region, &area);
for (list = gimp_image_get_sample_points (image);
list;
list = g_list_next (list))
{
gimp_display_shell_draw_sample_point (shell, list->data, FALSE);
gimp_display_shell_draw_sample_point (shell, list->data,
region ? &area : NULL,
FALSE);
}
}
}

4
app/display/gimpdisplayshell-draw.h
View File

@ -43,8 +43,10 @@ void gimp_display_shell_draw_pen (GimpDisplayShell *shell,
gint width);
void gimp_display_shell_draw_sample_point (GimpDisplayShell *shell,
GimpSamplePoint *sample_point,
const GdkRectangle *area,
gboolean active);
void gimp_display_shell_draw_sample_points (GimpDisplayShell *shell);
void gimp_display_shell_draw_sample_points (GimpDisplayShell *shell,
const GdkRegion *region);
void gimp_display_shell_draw_vector (GimpDisplayShell *shell,
GimpVectors *vectors);
void gimp_display_shell_draw_vectors (GimpDisplayShell *shell);

15
app/tools/gimpcolortool.c
View File

@ -210,15 +210,15 @@ gimp_color_tool_control (GimpTool *tool,
case GIMP_TOOL_ACTION_RESUME:
if (color_tool->sample_point &&
gimp_display_shell_get_show_sample_points (shell))
gimp_display_shell_draw_sample_point (shell,
color_tool->sample_point, TRUE);
gimp_display_shell_draw_sample_point (shell, color_tool->sample_point,
NULL, TRUE);
break;
case GIMP_TOOL_ACTION_HALT:
if (color_tool->sample_point &&
gimp_display_shell_get_show_sample_points (shell))
gimp_display_shell_draw_sample_point (shell,
color_tool->sample_point, FALSE);
gimp_display_shell_draw_sample_point (shell, color_tool->sample_point,
NULL, FALSE);
break;
}
@ -357,7 +357,7 @@ gimp_color_tool_button_release (GimpTool *tool,
if (color_tool->sample_point)
gimp_display_shell_draw_sample_point (shell, color_tool->sample_point,
TRUE);
NULL, TRUE);
color_tool->moving_sample_point = FALSE;
color_tool->sample_point_x = -1;
@ -497,7 +497,7 @@ gimp_color_tool_oper_update (GimpTool *tool,
if (color_tool->sample_point)
gimp_display_shell_draw_sample_point (shell, color_tool->sample_point,
TRUE);
NULL, TRUE);
}
static void
@ -824,7 +824,8 @@ gimp_color_tool_start_sample_point (GimpTool *tool,
if (color_tool->sample_point)
gimp_display_shell_draw_sample_point (gimp_display_get_shell (display),
color_tool->sample_point, FALSE);
color_tool->sample_point,
NULL, FALSE);
color_tool->sample_point = NULL;
color_tool->moving_sample_point = TRUE;