brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/entry: Don't set font twice on style changes

Browse Source 
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>
This commit is contained in:
Sebastian Keller 2020-10-29 20:59:21 +01:00 committed by Florian Müllner
parent e026e3bc9f
commit 237e470238
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/st/st-entry.c
View File

@ -243,8 +243,6 @@ st_entry_style_changed (StWidget *self)
StEntryPrivate *priv = ST_ENTRY_PRIV (self); StEntryPrivate *priv = ST_ENTRY_PRIV (self);
StThemeNode *theme_node; StThemeNode *theme_node;
ClutterColor color; ClutterColor color;
const PangoFontDescription *font;
gchar *font_string, *font_name;
gdouble size; gdouble size;
cogl_clear_object (&priv->text_shadow_material); 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)) if (st_theme_node_lookup_color (theme_node, "selected-color", TRUE, &color))
clutter_text_set_selected_text_color (CLUTTER_TEXT (priv->entry), &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); ST_WIDGET_CLASS (st_entry_parent_class)->style_changed (self);
} }