AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-16 07:04:29 +00:00
Code Issues Projects Releases Wiki Activity

textview: Track differences between ink and logical rects

Browse Source 
This way, we can ensure that we queue redraws on the full ink rect. This
is particularly visible for squiggly underlines in spell checking.

https://bugzilla.gnome.org/show_bug.cgi?id=763741
This commit is contained in:
Benjamin Otte 2016-03-16 00:35:45 +01:00 committed by Matthias Clasen
parent 031978cb6b
commit 45dfdbce3f
3 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk/gtktextbtree.c
View File

@ -2650,14 +2650,18 @@ redisplay_region (GtkTextBTree *tree,
else
end_y = _gtk_text_btree_find_line_top (tree, end_line, view->view_id);
ld = _gtk_text_line_get_data (start_line, view->view_id);
if (ld)
start_y -= ld->top_ink;
ld = _gtk_text_line_get_data (end_line, view->view_id);
if (ld)
end_y += ld->height;
end_y += ld->height + ld->bottom_ink;
if (cursors_only)
gtk_text_layout_cursors_changed (view->layout, start_y,
end_y - start_y,
end_y - start_y);
end_y - start_y);
else
gtk_text_layout_changed (view->layout, start_y,
end_y - start_y,
@ -3616,6 +3620,8 @@ _gtk_text_line_data_new (GtkTextLayout *layout,
line_data->next = NULL;
line_data->width = 0;
line_data->height = 0;
line_data->top_ink = 0;
line_data->bottom_ink = 0;
line_data->valid = FALSE;
return line_data;

2
gtk/gtktextbtree.h
View File

@ -220,6 +220,8 @@ struct _GtkTextLineData {
gpointer view_id;
GtkTextLineData *next;
gint height;
gint top_ink : 16;
gint bottom_ink : 16;
signed int width : 24;
guint valid : 8; /* Actually a boolean */
};

28
gtk/gtktextlayout.c
View File

@ -1041,23 +1041,31 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
if (!line_data || !line_data->valid)
{
gint old_height, new_height;
gint top_ink, bottom_ink;
old_height = line_data ? line_data->height : 0;
top_ink = line_data ? line_data->top_ink : 0;
bottom_ink = line_data ? line_data->bottom_ink : 0;
_gtk_text_btree_validate_line (_gtk_text_buffer_get_btree (layout->buffer),
line, layout);
line_data = _gtk_text_line_get_data (line, layout);
new_height = line_data ? line_data->height : 0;
if (line_data)
{
top_ink = MAX (top_ink, line_data->top_ink);
bottom_ink = MAX (bottom_ink, line_data->bottom_ink);
}
delta_height += new_height - old_height;
first_line = line;
first_line_y = -seen - new_height;
first_line_y = -seen - new_height - top_ink;
if (!last_line)
{
last_line = line;
last_line_y = -seen;
last_line_y = -seen + bottom_ink;
}
}
@ -1074,23 +1082,31 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
if (!line_data || !line_data->valid)
{
gint old_height, new_height;
gint top_ink, bottom_ink;
old_height = line_data ? line_data->height : 0;
top_ink = line_data ? line_data->top_ink : 0;
bottom_ink = line_data ? line_data->bottom_ink : 0;
_gtk_text_btree_validate_line (_gtk_text_buffer_get_btree (layout->buffer),
line, layout);
line_data = _gtk_text_line_get_data (line, layout);
new_height = line_data ? line_data->height : 0;
if (line_data)
{
top_ink = MAX (top_ink, line_data->top_ink);
bottom_ink = MAX (bottom_ink, line_data->bottom_ink);
}
delta_height += new_height - old_height;
if (!first_line)
{
first_line = line;
first_line_y = seen;
first_line_y = seen - top_ink;
}
last_line = line;
last_line_y = seen + new_height;
last_line_y = seen + new_height + bottom_ink;
}
seen += line_data ? line_data->height : 0;
@ -1152,6 +1168,7 @@ gtk_text_layout_real_wrap (GtkTextLayout *layout,
GtkTextLineData *line_data)
{
GtkTextLineDisplay *display;
PangoRectangle ink_rect, logical_rect;
g_return_val_if_fail (GTK_IS_TEXT_LAYOUT (layout), NULL);
g_return_val_if_fail (line != NULL, NULL);
@ -1166,6 +1183,9 @@ gtk_text_layout_real_wrap (GtkTextLayout *layout,
line_data->width = display->width;
line_data->height = display->height;
line_data->valid = TRUE;
pango_layout_get_pixel_extents (display->layout, &ink_rect, &logical_rect);
line_data->top_ink = MAX (0, logical_rect.x - ink_rect.x);
line_data->bottom_ink = MAX (0, logical_rect.x + logical_rect.width - ink_rect.x - ink_rect.width);
gtk_text_layout_free_line_display (layout, display);
return line_data;