[gnome-shell/gnome-3-38] st/entry: Don't set font twice on style changes



commit 92763f7b95fcdc3e407679c8ae8e66211fa91789
Author: Sebastian Keller <skeller gnome org>
Date:   Thu Oct 29 20:59:21 2020 +0100

    st/entry: Don't set font twice on style changes
    
    Setting the font is already handled by _st_set_text_from_style() since
    be76b19300.
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1489>
    
    (cherry picked from commit 237e470238641bd0d5f93521383b12f6c457b11b)

 src/st/st-entry.c | 11 -----------
 1 file changed, 11 deletions(-)
---
diff --git a/src/st/st-entry.c b/src/st/st-entry.c
index 043be6a7cc..a8edb2de4d 100644
--- a/src/st/st-entry.c
+++ b/src/st/st-entry.c
@@ -243,8 +243,6 @@ st_entry_style_changed (StWidget *self)
   StEntryPrivate *priv = ST_ENTRY_PRIV (self);
   StThemeNode *theme_node;
   ClutterColor color;
-  const PangoFontDescription *font;
-  gchar *font_string, *font_name;
   gdouble size;
 
   cogl_clear_object (&priv->text_shadow_material);
@@ -265,15 +263,6 @@ st_entry_style_changed (StWidget *self)
   if (st_theme_node_lookup_color (theme_node, "selected-color", TRUE, &color))
     clutter_text_set_selected_text_color (CLUTTER_TEXT (priv->entry), &color);
 
-  font = st_theme_node_get_font (theme_node);
-  font_string = pango_font_description_to_string (font);
-  font_name = g_strdup (clutter_text_get_font_name (CLUTTER_TEXT (priv->entry)));
-  clutter_text_set_font_name (CLUTTER_TEXT (priv->entry), font_string);
-  if (strcmp (clutter_text_get_font_name (CLUTTER_TEXT (priv->entry)), font_name) != 0)
-    clutter_actor_queue_relayout (priv->entry);
-  g_free (font_string);
-  g_free (font_name);
-
   ST_WIDGET_CLASS (st_entry_parent_class)->style_changed (self);
 }
 


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