AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 13:41:07 +00:00
Code Issues Projects Releases Wiki Activity

linedisplaycache: improve invalidation with y_range

Browse Source 
When we invalidate a y_range using the common pattern of y==0 and
old_height==new_height, we are generally invalidating the entire buffer.

This short-circuits that case to just invalidate the buffer in a faster
and more complete form. The problem here appears to be that we can't
always calculate the ranges properly to invalidate because validation
has not run far enough.
This commit is contained in:
Christian Hergert 2020-08-07 12:25:06 -07:00
parent cd0b9a2359
commit 35325ea11a
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtktextlayout.c
View File

@ -656,7 +656,7 @@ gtk_text_layout_changed (GtkTextLayout *layout,
int new_height)
{
GtkTextLayoutPrivate *priv = GTK_TEXT_LAYOUT_GET_PRIVATE (layout);
gtk_text_line_display_cache_invalidate_y_range (priv->cache, layout, y, old_height, FALSE);
gtk_text_line_display_cache_invalidate_y_range (priv->cache, layout, y, old_height, new_height, FALSE);
gtk_text_layout_emit_changed (layout, y, old_height, new_height);
}
@ -667,7 +667,7 @@ gtk_text_layout_cursors_changed (GtkTextLayout *layout,
int new_height)
{
GtkTextLayoutPrivate *priv = GTK_TEXT_LAYOUT_GET_PRIVATE (layout);
gtk_text_line_display_cache_invalidate_y_range (priv->cache, layout, y, old_height, TRUE);
gtk_text_line_display_cache_invalidate_y_range (priv->cache, layout, y, old_height, new_height, TRUE);
gtk_text_layout_emit_changed (layout, y, old_height, new_height);
}

10
gtk/gtktextlinedisplaycache.c
View File

@ -642,7 +642,8 @@ find_iter_at_at_y (GtkTextLineDisplayCache *cache,
* gtk_text_line_display_cache_invalidate_y_range:
* @cache: a GtkTextLineDisplayCache
* @y: the starting Y position
* @old_height: the height to invalidate
* @old_height: the old height of the range
* @new_height: the new height of the range
* @cursors_only: if only cursors should be invalidated
*
* Remove all GtkTextLineDisplay that fall into the range starting
@ -653,6 +654,7 @@ gtk_text_line_display_cache_invalidate_y_range (GtkTextLineDisplayCache *cache,
GtkTextLayout *layout,
int y,
int old_height,
int new_height,
gboolean cursors_only)
{
GSequenceIter *iter;
@ -663,7 +665,11 @@ gtk_text_line_display_cache_invalidate_y_range (GtkTextLineDisplayCache *cache,
STAT_INC (cache->inval_by_y_range);
if (y < 0)
/* A common pattern is to invalidate the whole buffer using y==0 and
* old_height==new_height. So special case that instead of walking through
* each display item one at a time.
*/
if (y < 0 || (y == 0 && old_height == new_height))
{
gtk_text_line_display_cache_invalidate (cache);
return;

3
gtk/gtktextlinedisplaycacheprivate.h
View File

@ -51,7 +51,8 @@ void gtk_text_line_display_cache_invalidate_range (GtkText
void gtk_text_line_display_cache_invalidate_y_range (GtkTextLineDisplayCache *cache,
GtkTextLayout *layout,
int y,
int height,
int old_height,
int new_height,
gboolean cursors_only);
void gtk_text_line_display_cache_set_mru_size (GtkTextLineDisplayCache *cache,
guint mru_size);