[gtk] textlayout: Avoid querying CSS state if we don't have to



commit f4cb60dcca46b6acfd768242b49d2f91c79fdd3f
Author: Timm Bäder <tbaeder redhat com>
Date:   Mon Jul 22 13:59:47 2019 +0200

    textlayout: Avoid querying CSS state if we don't have to
    
    This is actually pretty slow, and we almost never render a selection.

 gtk/gtktextlayout.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 08c511ec33..f5dc11722b 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -3798,9 +3798,8 @@ render_para (GskPangoRenderer   *crenderer,
   int byte_offset = 0;
   PangoLayoutIter *iter;
   int screen_width;
-  GdkRGBA *selection;
+  GdkRGBA *selection = NULL;
   gboolean first = TRUE;
-  GtkCssNode *selection_node;
   graphene_point_t point = { 0, offset_y };
 
   g_return_if_fail (GTK_IS_TEXT_VIEW (crenderer->widget));
@@ -3808,13 +3807,16 @@ render_para (GskPangoRenderer   *crenderer,
   iter = pango_layout_get_iter (layout);
   screen_width = line_display->total_width;
 
-  context = gtk_widget_get_style_context (crenderer->widget);
-  selection_node = gtk_text_view_get_selection_node ((GtkTextView*)crenderer->widget);
-  gtk_style_context_save_to_node (context, selection_node);
+  context = _gtk_widget_get_style_context (crenderer->widget);
+  if (selection_start_index != -1 || selection_end_index != -1)
+    {
+      GtkCssNode *selection_node = gtk_text_view_get_selection_node ((GtkTextView*)crenderer->widget);
+      gtk_style_context_save_to_node (context, selection_node);
 
-  gtk_style_context_get (context, "background-color", &selection, NULL);
+      gtk_style_context_get (context, "background-color", &selection, NULL);
 
-  gtk_style_context_restore (context);
+      gtk_style_context_restore (context);
+    }
 
   gtk_snapshot_save (crenderer->snapshot);
   gtk_snapshot_translate (crenderer->snapshot, &point);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]