callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: handle GimpTileHandlerValidate::invalidated in gimp:buffer-source-validate

Browse Source 
In gimp:buffer-source-validate, invalidate the node in response to
GimpTileHandlerValidate::invalidated, added in the previous commit,
in addition to GeglBuffer::changed.

(cherry picked from commit bb8ee0e686)
This commit is contained in:
Ell
2020-01-15 21:48:13 +02:00
parent 0a93f5609e
commit e409f301fe
1 changed files with 51 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
app/operations/gimpoperationbuffersourcevalidate.c
View File

@ -56,9 +56,9 @@ static gboolean gimp_operation_buffer_source_validate_process (Ge
const GeglRectangle *result, const GeglRectangle *result,
gint level); gint level);
static void gimp_operation_buffer_source_validate_buffer_changed (GeglBuffer *buffer, static void gimp_operation_buffer_source_validate_invalidate (gpointer object,
const GeglRectangle *rect, const GeglRectangle *rect,
gpointer data); GimpOperationBufferSourceValidate *buffer_source_validate);
G_DEFINE_TYPE (GimpOperationBufferSourceValidate, gimp_operation_buffer_source_validate, G_DEFINE_TYPE (GimpOperationBufferSourceValidate, gimp_operation_buffer_source_validate,
@ -110,9 +110,23 @@ gimp_operation_buffer_source_validate_dispose (GObject *object)
if (buffer_source_validate->buffer) if (buffer_source_validate->buffer)
{ {
GimpTileHandlerValidate *validate_handler;
validate_handler = gimp_tile_handler_validate_get_assigned (
buffer_source_validate->buffer);
if (validate_handler)
{
g_signal_connect (
validate_handler,
"invalidated",
G_CALLBACK (gimp_operation_buffer_source_validate_invalidate),
buffer_source_validate);
}
g_signal_handlers_disconnect_by_func ( g_signal_handlers_disconnect_by_func (
buffer_source_validate->buffer, buffer_source_validate->buffer,
gimp_operation_buffer_source_validate_buffer_changed, gimp_operation_buffer_source_validate_invalidate,
buffer_source_validate); buffer_source_validate);
g_clear_object (&buffer_source_validate->buffer); g_clear_object (&buffer_source_validate->buffer);
@ -155,16 +169,29 @@ gimp_operation_buffer_source_validate_set_property (GObject *object,
{ {
if (buffer_source_validate->buffer) if (buffer_source_validate->buffer)
{ {
gimp_operation_buffer_source_validate_buffer_changed ( GimpTileHandlerValidate *validate_handler;
validate_handler = gimp_tile_handler_validate_get_assigned (
buffer_source_validate->buffer);
gimp_operation_buffer_source_validate_invalidate (
buffer_source_validate->buffer, buffer_source_validate->buffer,
gegl_buffer_get_extent (buffer_source_validate->buffer), gegl_buffer_get_extent (buffer_source_validate->buffer),
buffer_source_validate); buffer_source_validate);
g_signal_handlers_disconnect_by_func ( g_signal_handlers_disconnect_by_func (
buffer_source_validate->buffer, buffer_source_validate->buffer,
G_CALLBACK (gimp_operation_buffer_source_validate_buffer_changed), gimp_operation_buffer_source_validate_invalidate,
buffer_source_validate); buffer_source_validate);
if (validate_handler)
{
g_signal_handlers_disconnect_by_func (
validate_handler,
gimp_operation_buffer_source_validate_invalidate,
buffer_source_validate);
}
g_clear_object (&buffer_source_validate->buffer); g_clear_object (&buffer_source_validate->buffer);
} }
@ -172,13 +199,27 @@ gimp_operation_buffer_source_validate_set_property (GObject *object,
if (buffer_source_validate->buffer) if (buffer_source_validate->buffer)
{ {
GimpTileHandlerValidate *validate_handler;
validate_handler = gimp_tile_handler_validate_get_assigned (
buffer_source_validate->buffer);
if (validate_handler)
{
g_signal_connect (
validate_handler,
"invalidated",
G_CALLBACK (gimp_operation_buffer_source_validate_invalidate),
buffer_source_validate);
}
gegl_buffer_signal_connect ( gegl_buffer_signal_connect (
buffer_source_validate->buffer, buffer_source_validate->buffer,
"changed", "changed",
G_CALLBACK (gimp_operation_buffer_source_validate_buffer_changed), G_CALLBACK (gimp_operation_buffer_source_validate_invalidate),
buffer_source_validate); buffer_source_validate);
gimp_operation_buffer_source_validate_buffer_changed ( gimp_operation_buffer_source_validate_invalidate (
buffer_source_validate->buffer, buffer_source_validate->buffer,
gegl_buffer_get_extent (buffer_source_validate->buffer), gegl_buffer_get_extent (buffer_source_validate->buffer),
buffer_source_validate); buffer_source_validate);
@ -257,12 +298,10 @@ gimp_operation_buffer_source_validate_process (GeglOperation *operation,
} }
static void static void
gimp_operation_buffer_source_validate_buffer_changed (GeglBuffer *buffer, gimp_operation_buffer_source_validate_invalidate (gpointer object,
const GeglRectangle *rect, const GeglRectangle *rect,
gpointer data) GimpOperationBufferSourceValidate *buffer_source_validate)
{ {
GimpOperationBufferSourceValidate *buffer_source_validate = GIMP_OPERATION_BUFFER_SOURCE_VALIDATE (data);
gegl_operation_invalidate (GEGL_OPERATION (buffer_source_validate), gegl_operation_invalidate (GEGL_OPERATION (buffer_source_validate),
rect, FALSE); rect, FALSE);
} }