Merge branch 'block-cursor-fixes' into 'master'

textview: Don't eat block cursors

See merge request GNOME/gtk!3857
This commit is contained in:
Matthias Clasen 2021-08-20 06:18:07 +00:00
commit 45c047f5c0

View File

@ -4213,7 +4213,8 @@ gtk_text_layout_snapshot (GtkTextLayout *layout,
if (line_display->node == NULL && if (line_display->node == NULL &&
(pango_layout_get_character_count (line_display->layout) > 0 || (pango_layout_get_character_count (line_display->layout) > 0 ||
selection_start_index != -1 || selection_end_index != -1)) selection_start_index != -1 || selection_end_index != -1 ||
line_display->has_block_cursor))
{ {
gtk_snapshot_push_collect (snapshot); gtk_snapshot_push_collect (snapshot);
render_para (crenderer, line_display, render_para (crenderer, line_display,