AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gsk: Make rendernode diffing smarter

Browse Source 
Allow comparing container nodes to any other
node, by pretending the other node is a single
child container (if it isn't one already).

This fixes a glitch where we redraw the full
entry text when the blinking cursor goes to
opacity 0, since GskSnapshot then optimizes
away first the opacity node, and then the
single-child container.
This commit is contained in:
Matthias Clasen 2021-03-28 10:18:23 -04:00
parent 0904dd29c2
commit 2d5dd7b3d7
3 changed files with 53 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gsk/gskrendernode.c
View File

@ -489,10 +489,14 @@ gsk_render_node_can_diff (const GskRenderNode *node1,
if (node1 == node2) if (node1 == node2)
return TRUE; return TRUE;
if (_gsk_render_node_get_node_type (node1) != _gsk_render_node_get_node_type (node2)) if (_gsk_render_node_get_node_type (node1) == _gsk_render_node_get_node_type (node2))
return FALSE; return GSK_RENDER_NODE_GET_CLASS (node1)->can_diff (node1, node2);
return GSK_RENDER_NODE_GET_CLASS (node1)->can_diff (node1, node2); if (_gsk_render_node_get_node_type (node1) == GSK_CONTAINER_NODE ||
_gsk_render_node_get_node_type (node2) == GSK_CONTAINER_NODE)
return TRUE;
return FALSE;
} }
static void static void
@ -544,10 +548,15 @@ gsk_render_node_diff (GskRenderNode *node1,
if (node1 == node2) if (node1 == node2)
return; return;
if (_gsk_render_node_get_node_type (node1) != _gsk_render_node_get_node_type (node2)) if (_gsk_render_node_get_node_type (node1) == _gsk_render_node_get_node_type (node2))
return gsk_render_node_diff_impossible (node1, node2, region); return GSK_RENDER_NODE_GET_CLASS (node1)->diff (node1, node2, region);
return GSK_RENDER_NODE_GET_CLASS (node1)->diff (node1, node2, region); if (_gsk_render_node_get_node_type (node1) == GSK_CONTAINER_NODE)
return gsk_container_node_diff_with (node1, node2, region);
if (_gsk_render_node_get_node_type (node2) == GSK_CONTAINER_NODE)
return gsk_container_node_diff_with (node2, node1, region);
return gsk_render_node_diff_impossible (node1, node2, region);
} }
/** /**

41
gsk/gskrendernodeimpl.c
View File

@ -2641,6 +2641,36 @@ gsk_container_node_get_diff_settings (void)
return settings; return settings;
} }
static gboolean
gsk_render_node_diff_multiple (GskRenderNode **nodes1,
gsize n_nodes1,
GskRenderNode **nodes2,
gsize n_nodes2,
cairo_region_t *region)
{
return gsk_diff ((gconstpointer *) nodes1, n_nodes1,
(gconstpointer *) nodes2, n_nodes2,
gsk_container_node_get_diff_settings (),
region) == GSK_DIFF_OK;
}
void
gsk_container_node_diff_with (GskRenderNode *container,
GskRenderNode *other,
cairo_region_t *region)
{
GskContainerNode *self = (GskContainerNode *) container;
if (gsk_render_node_diff_multiple (self->children,
self->n_children,
&other,
1,
region))
return;
gsk_render_node_diff_impossible (container, other, region);
}
static void static void
gsk_container_node_diff (GskRenderNode *node1, gsk_container_node_diff (GskRenderNode *node1,
GskRenderNode *node2, GskRenderNode *node2,
@ -2649,12 +2679,11 @@ gsk_container_node_diff (GskRenderNode *node1,
GskContainerNode *self1 = (GskContainerNode *) node1; GskContainerNode *self1 = (GskContainerNode *) node1;
GskContainerNode *self2 = (GskContainerNode *) node2; GskContainerNode *self2 = (GskContainerNode *) node2;
if (gsk_diff ((gconstpointer *) self1->children, if (gsk_render_node_diff_multiple (self1->children,
self1->n_children, self1->n_children,
(gconstpointer *) self2->children, self2->children,
self2->n_children, self2->n_children,
gsk_container_node_get_diff_settings (), region))
region) == GSK_DIFF_OK)
return; return;
gsk_render_node_diff_impossible (node1, node2, region); gsk_render_node_diff_impossible (node1, node2, region);

3
gsk/gskrendernodeprivate.h
View File

@ -93,6 +93,9 @@ void gsk_render_node_diff (GskRenderNode
void gsk_render_node_diff_impossible (GskRenderNode *node1, void gsk_render_node_diff_impossible (GskRenderNode *node1,
GskRenderNode *node2, GskRenderNode *node2,
cairo_region_t *region); cairo_region_t *region);
void gsk_container_node_diff_with (GskRenderNode *container,
GskRenderNode *other,
cairo_region_t *region);
bool gsk_border_node_get_uniform (const GskRenderNode *self); bool gsk_border_node_get_uniform (const GskRenderNode *self);
bool gsk_border_node_get_uniform_color (const GskRenderNode *self); bool gsk_border_node_get_uniform_color (const GskRenderNode *self);