|
 |
b9a760 |
From fa933b5ec52d5ade2ca8eddefbd2de35d941c385 Mon Sep 17 00:00:00 2001
|
|
|
b9a760 |
From: Lionel Landwerlin <llandwerlin@gmail.com>
|
|
|
b9a760 |
Date: Tue, 11 Jun 2013 14:01:30 +0100
|
|
|
b9a760 |
Subject: [PATCH] clutter-text: prevent reset of user set font descriptions on
|
|
|
b9a760 |
dpi changes
|
|
|
b9a760 |
|
|
|
b9a760 |
When setting the font using clutter_text_set_font_description(), the
|
|
|
b9a760 |
font settings on a ClutterText actor can be reset when there is a dpi
|
|
|
b9a760 |
changes signaled by the backend.
|
|
|
b9a760 |
|
|
|
b9a760 |
https://bugzilla.gnome.org/show_bug.cgi?id=702016
|
|
|
b9a760 |
---
|
|
|
b9a760 |
clutter/clutter-text.c | 13 ++++++++-----
|
|
|
b9a760 |
1 file changed, 8 insertions(+), 5 deletions(-)
|
|
|
b9a760 |
|
|
|
b9a760 |
diff --git a/clutter/clutter-text.c b/clutter/clutter-text.c
|
|
|
b9a760 |
index e0901cd..7b83ad6 100644
|
|
|
b9a760 |
--- a/clutter/clutter-text.c
|
|
|
b9a760 |
+++ b/clutter/clutter-text.c
|
|
|
b9a760 |
@@ -568,10 +568,13 @@ clutter_text_dirty_cache (ClutterText *text)
|
|
|
b9a760 |
*/
|
|
|
b9a760 |
static inline void
|
|
|
b9a760 |
clutter_text_set_font_description_internal (ClutterText *self,
|
|
|
b9a760 |
- PangoFontDescription *desc)
|
|
|
b9a760 |
+ PangoFontDescription *desc,
|
|
|
b9a760 |
+ gboolean is_default_font)
|
|
|
b9a760 |
{
|
|
|
b9a760 |
ClutterTextPrivate *priv = self->priv;
|
|
|
b9a760 |
|
|
|
b9a760 |
+ priv->is_default_font = is_default_font;
|
|
|
b9a760 |
+
|
|
|
b9a760 |
if (priv->font_desc == desc ||
|
|
|
b9a760 |
pango_font_description_equal (priv->font_desc, desc))
|
|
|
b9a760 |
return;
|
|
|
b9a760 |
@@ -619,7 +622,7 @@ clutter_text_settings_changed_cb (ClutterText *text)
|
|
|
b9a760 |
font_name);
|
|
|
b9a760 |
|
|
|
b9a760 |
font_desc = pango_font_description_from_string (font_name);
|
|
|
b9a760 |
- clutter_text_set_font_description_internal (text, font_desc);
|
|
|
b9a760 |
+ clutter_text_set_font_description_internal (text, font_desc, TRUE);
|
|
|
b9a760 |
|
|
|
b9a760 |
pango_font_description_free (font_desc);
|
|
|
b9a760 |
g_free (font_name);
|
|
|
b9a760 |
@@ -4945,7 +4948,8 @@ clutter_text_set_font_description (ClutterText *self,
|
|
|
b9a760 |
{
|
|
|
b9a760 |
g_return_if_fail (CLUTTER_IS_TEXT (self));
|
|
|
b9a760 |
|
|
|
b9a760 |
- clutter_text_set_font_description_internal (self, font_desc);
|
|
|
b9a760 |
+ clutter_text_set_font_description_internal (self, font_desc,
|
|
|
b9a760 |
+ font_desc == NULL);
|
|
|
b9a760 |
}
|
|
|
b9a760 |
|
|
|
b9a760 |
/**
|
|
|
b9a760 |
@@ -5052,8 +5056,7 @@ clutter_text_set_font_name (ClutterText *self,
|
|
|
b9a760 |
}
|
|
|
b9a760 |
|
|
|
b9a760 |
/* this will set the font_name field as well */
|
|
|
b9a760 |
- clutter_text_set_font_description_internal (self, desc);
|
|
|
b9a760 |
- priv->is_default_font = is_default_font;
|
|
|
b9a760 |
+ clutter_text_set_font_description_internal (self, desc, is_default_font);
|
|
|
b9a760 |
|
|
|
b9a760 |
g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_FONT_NAME]);
|
|
|
b9a760 |
|
|
|
b9a760 |
--
|
|
|
b9a760 |
1.8.3.1
|
|
|
b9a760 |
|