s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use font from style.

Browse Source
This commit is contained in:
Daiki Ueno
2011-03-08 10:41:45 +09:00
parent 627cbf2898
commit ace4391b79
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
eek/eek-renderer.c
View File

@ -344,7 +344,7 @@ struct _CalculateFontSizeCallbackData {
gdouble size; gdouble size;
gdouble em_size; gdouble em_size;
EekRenderer *renderer; EekRenderer *renderer;
PangoFontDescription *base_font; const PangoFontDescription *base_font;
}; };
typedef struct _CalculateFontSizeCallbackData CalculateFontSizeCallbackData; typedef struct _CalculateFontSizeCallbackData CalculateFontSizeCallbackData;
@ -407,7 +407,7 @@ calculate_font_size_section_callback (EekElement *element, gpointer user_data)
} }
static gdouble static gdouble
calculate_font_size (EekRenderer *renderer, PangoFontDescription *base_font) calculate_font_size (EekRenderer *renderer, const PangoFontDescription *base_font)
{ {
EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(renderer); EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(renderer);
CalculateFontSizeCallbackData data; CalculateFontSizeCallbackData data;
@ -561,9 +561,14 @@ eek_renderer_real_render_key_label (EekRenderer *self,
return; return;
if (!priv->font) { if (!priv->font) {
PangoFontDescription *base_font; const PangoFontDescription *base_font;
gdouble size; gdouble size;
EekThemeNode *theme_node;
theme_node = g_object_get_data (G_OBJECT(key), "theme-node");
if (theme_node)
base_font = eek_theme_node_get_font (theme_node);
else
base_font = pango_context_get_font_description (priv->pcontext); base_font = pango_context_get_font_description (priv->pcontext);
size = calculate_font_size (self, base_font); size = calculate_font_size (self, base_font);
priv->font = pango_font_description_copy (base_font); priv->font = pango_font_description_copy (base_font);