isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-17 05:44:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the default font from the Backend

Browse Source 
Instead of storing the default font name and size as a pre-processor
macro, use the newly added ClutterBackend API to retrieve the current
default font from the backend.
This commit is contained in:
Emmanuele Bassi 2008-12-23 15:05:16 +00:00
parent 7262542155
commit e3785f4f45
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
clutter/clutter-text.c
View File

@ -57,8 +57,6 @@
#include "clutter-private.h" /* includes pango/cogl-pango.h */ #include "clutter-private.h" /* includes pango/cogl-pango.h */
#include "clutter-units.h" #include "clutter-units.h"
#define DEFAULT_FONT_NAME "Sans 10"
/* cursor width in pixels */ /* cursor width in pixels */
#define DEFAULT_CURSOR_SIZE 2 #define DEFAULT_CURSOR_SIZE 2
@ -1962,6 +1960,7 @@ static void
clutter_text_init (ClutterText *self) clutter_text_init (ClutterText *self)
{ {
ClutterTextPrivate *priv; ClutterTextPrivate *priv;
const gchar *font_name;
int i; int i;
self->priv = priv = CLUTTER_TEXT_GET_PRIVATE (self); self->priv = priv = CLUTTER_TEXT_GET_PRIVATE (self);
@ -1986,8 +1985,10 @@ clutter_text_init (ClutterText *self)
priv->text_color = default_text_color; priv->text_color = default_text_color;
priv->cursor_color = default_cursor_color; priv->cursor_color = default_cursor_color;
priv->font_name = g_strdup (DEFAULT_FONT_NAME); /* get the default font name from the context */
priv->font_desc = pango_font_description_from_string (priv->font_name); font_name = clutter_backend_get_font_name (clutter_get_default_backend ());
priv->font_name = g_strdup (font_name);
priv->font_desc = pango_font_description_from_string (font_name);
priv->position = -1; priv->position = -1;
priv->selection_bound = -1; priv->selection_bound = -1;
@ -2549,11 +2550,13 @@ clutter_text_get_font_name (ClutterText *text)
/** /**
* clutter_text_set_font_name: * clutter_text_set_font_name:
* @self: a #ClutterText * @self: a #ClutterText
* @font_name: a font name * @font_name: a font name, or %NULL to set the default font name
* *
* Sets the font used by a #ClutterText. The @font_name string * Sets the font used by a #ClutterText. The @font_name string
* must be something that can be parsed by the * must either be %NULL, which means that the font name from the
* pango_font_description_from_string() function, like: * default #ClutterBackend will be used; or be something that can
* be parsed by the pango_font_description_from_string() function,
* like:
* *
* |[ * |[
* clutter_text_set_font_name (text, "Sans 10pt"); * clutter_text_set_font_name (text, "Sans 10pt");
@ -2572,8 +2575,9 @@ clutter_text_set_font_name (ClutterText *self,
g_return_if_fail (CLUTTER_IS_TEXT (self)); g_return_if_fail (CLUTTER_IS_TEXT (self));
/* get the default font name from the backend */
if (!font_name || font_name[0] == '\0') if (!font_name || font_name[0] == '\0')
font_name = DEFAULT_FONT_NAME; font_name = clutter_backend_get_font_name (clutter_get_default_backend ());
priv = self->priv; priv = self->priv;