dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: make gimp_font_get_standard() return a GimpData 

like all other GimpData sublasses.
This commit is contained in:
Michael Natterer 2018-06-03 22:46:48 +02:00
parent f23958407c
commit 40b95227af
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/core/gimpcontext.c
View File

@ -3260,7 +3260,7 @@ gimp_context_set_font_name (GimpContext *context,
/* No font with this name exists, use the standard font, but
* keep the intended name around
*/
gimp_context_set_font (context, gimp_font_get_standard ());
gimp_context_set_font (context, GIMP_FONT (gimp_font_get_standard ()));
g_free (context->font_name);
context->font_name = g_strdup (name);
@ -3334,7 +3334,7 @@ gimp_context_real_set_font (GimpContext *context,
return;
if (context->font_name &&
font != gimp_font_get_standard ())
font != GIMP_FONT (gimp_font_get_standard ()))
{
g_free (context->font_name);
context->font_name = NULL;
@ -3355,7 +3355,7 @@ gimp_context_real_set_font (GimpContext *context,
context,
0);
if (font != gimp_font_get_standard ())
if (font != GIMP_FONT (gimp_font_get_standard ()))
context->font_name = g_strdup (gimp_object_get_name (font));
}

18
app/text/gimpfont.c
View File

@ -326,15 +326,23 @@ gimp_font_get_new_preview (GimpViewable *viewable,
return temp_buf;
}
GimpFont *
GimpData *
gimp_font_get_standard (void)
{
static GimpFont *standard_font = NULL;
static GimpData *standard_font = NULL;
if (! standard_font)
standard_font = g_object_new (GIMP_TYPE_FONT,
"name", "Sans-serif",
NULL);
{
standard_font = g_object_new (GIMP_TYPE_FONT,
"name", "Sans-serif",
NULL);
gimp_data_clean (standard_font);
gimp_data_make_internal (standard_font, "gimp-font-standard");
g_object_add_weak_pointer (G_OBJECT (standard_font),
(gpointer *) &standard_font);
}
return standard_font;
}

2
app/text/gimpfont.h
View File

@ -39,7 +39,7 @@ typedef struct _GimpFontClass GimpFontClass;
GType gimp_font_get_type (void) G_GNUC_CONST;
GimpFont * gimp_font_get_standard (void);
GimpData * gimp_font_get_standard (void);
#endif /* __GIMP_FONT_H__ */