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

textlayout: Create the cursor snapshot on demand

Browse Source 
We don't need it all the time.
This commit is contained in:
Matthias Clasen 2021-04-04 22:27:13 -04:00
parent 5b0ea70d1c
commit 2af99bd65e
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gtk/gtktextlayout.c
View File

@ -4108,7 +4108,6 @@ gtk_text_layout_snapshot (GtkTextLayout *layout,
GSList *tmp_list;
GdkRGBA color;
GtkSnapshot *cursor_snapshot;
GskRenderNode *cursors;
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
g_return_if_fail (layout->default_style != NULL);
@ -4117,18 +4116,18 @@ gtk_text_layout_snapshot (GtkTextLayout *layout,
priv = GTK_TEXT_LAYOUT_GET_PRIVATE (layout);
context = gtk_widget_get_style_context (widget);
gtk_style_context_get_color (context, &color);
line_list = gtk_text_layout_get_lines (layout, clip->y, clip->y + clip->height, &offset_y);
if (line_list == NULL)
return; /* nothing on the screen */
context = gtk_widget_get_style_context (widget);
gtk_style_context_get_color (context, &color);
gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (0, offset_y));
offset_y = 0;
cursor_snapshot = gtk_snapshot_new ();
cursor_snapshot = NULL;
crenderer = gsk_pango_renderer_acquire ();
@ -4138,8 +4137,6 @@ gtk_text_layout_snapshot (GtkTextLayout *layout,
crenderer->snapshot = snapshot;
crenderer->fg_color = &color;
gtk_text_layout_wrap_loop_start (layout);
have_selection = gtk_text_buffer_get_selection_bounds (layout->buffer,
&selection_start,
&selection_end);
@ -4150,7 +4147,6 @@ gtk_text_layout_snapshot (GtkTextLayout *layout,
selection_start_line = gtk_text_iter_get_line (&selection_start);
selection_end_line = gtk_text_iter_get_line (&selection_end);
context = _gtk_widget_get_style_context (crenderer->widget);
selection_node = gtk_text_view_get_selection_node ((GtkTextView*)widget);
gtk_style_context_save_to_node (context, selection_node);
@ -4165,6 +4161,8 @@ gtk_text_layout_snapshot (GtkTextLayout *layout,
selection = NULL;
}
gtk_text_layout_wrap_loop_start (layout);
tmp_list = line_list;
while (tmp_list != NULL)
{
@ -4217,8 +4215,7 @@ gtk_text_layout_snapshot (GtkTextLayout *layout,
if (line_display->node != NULL)
{
if (line_display->has_block_cursor &&
gtk_widget_has_focus (widget))
if (line_display->has_block_cursor && gtk_widget_has_focus (widget))
g_clear_pointer (&line_display->node, gsk_render_node_unref);
}
@ -4248,9 +4245,10 @@ gtk_text_layout_snapshot (GtkTextLayout *layout,
*/
if (line_display->cursors != NULL)
{
int i;
if (cursor_snapshot == NULL)
cursor_snapshot = gtk_snapshot_new ();
for (i = 0; i < line_display->cursors->len; i++)
for (int i = 0; i < line_display->cursors->len; i++)
{
PangoDirection dir;
CursorPosition cursor;
@ -4280,11 +4278,16 @@ gtk_text_layout_snapshot (GtkTextLayout *layout,
gtk_text_layout_wrap_loop_end (layout);
cursors = gtk_snapshot_free_to_node (cursor_snapshot);
if (cursors)
if (cursor_snapshot)
{
gtk_snapshot_append_node (crenderer->snapshot, cursors);
gsk_render_node_unref (cursors);
GskRenderNode *cursors;
cursors = gtk_snapshot_free_to_node (cursor_snapshot);
if (cursors)
{
gtk_snapshot_append_node (crenderer->snapshot, cursors);
gsk_render_node_unref (cursors);
}
}
/* Only update eviction source once per snapshot */