Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ngl-textview-cursor' into 'master'

Browse Source 
Ngl textview cursor

See merge request GNOME/gtk!3292
This commit is contained in:
Matthias Clasen
2021-03-13 12:33:15 +00:00
parent e345f9a4db 9be2f130f0
commit 1d773df9f2
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gsk/ngl/gsknglcommandqueue.c
View File

@@ -143,7 +143,7 @@ G_GNUC_UNUSED static inline void
gsk_ngl_command_queue_print_batch (GskNglCommandQueue *self,
const GskNglCommandBatch *batch)
{
static const char *command_kinds[] = { "Clear", NULL, NULL, "Draw", };
static const char *command_kinds[] = { "Clear", "Draw", };
guint framebuffer_id;
g_assert (GSK_IS_NGL_COMMAND_QUEUE (self));

17
gtk/gtktextlayout.c
View File

@@ -4142,6 +4142,8 @@ gtk_text_layout_snapshot (GtkTextLayout *layout,
GSList *line_list;
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);
@@ -4158,6 +4160,8 @@ gtk_text_layout_snapshot (GtkTextLayout *layout,
if (line_list == NULL)
return; /* nothing on the screen */
cursor_snapshot = gtk_snapshot_new ();
crenderer = gsk_pango_renderer_acquire ();
gsk_pango_renderer_set_shape_handler (crenderer, snapshot_shape);
@@ -4274,14 +4278,14 @@ gtk_text_layout_snapshot (GtkTextLayout *layout,
dir = (line_display->direction == GTK_TEXT_DIR_RTL) ? PANGO_DIRECTION_RTL : PANGO_DIRECTION_LTR;
if (cursor.is_insert || cursor.is_selection_bound)
gtk_snapshot_push_opacity (crenderer->snapshot, cursor_alpha);
gtk_snapshot_push_opacity (cursor_snapshot, cursor_alpha);
gtk_snapshot_render_insertion_cursor (crenderer->snapshot, context,
gtk_snapshot_render_insertion_cursor (cursor_snapshot, context,
line_display->x_offset, offset_y + line_display->top_margin,
line_display->layout, cursor.pos, dir);
if (cursor.is_insert || cursor.is_selection_bound)
gtk_snapshot_pop (crenderer->snapshot);
gtk_snapshot_pop (cursor_snapshot);
}
}
} /* line_display->height > 0 */
@@ -4295,6 +4299,13 @@ gtk_text_layout_snapshot (GtkTextLayout *layout,
gtk_text_layout_wrap_loop_end (layout);
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 */
gtk_text_line_display_cache_delay_eviction (priv->cache);