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

Pass base_font during size calculation.

Browse Source
This commit is contained in:
Daiki Ueno
2011-03-08 07:04:12 +09:00
parent baae80fa41
commit 627cbf2898
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
eek/eek-renderer.c
View File

@ -344,6 +344,7 @@ struct _CalculateFontSizeCallbackData {
gdouble size; gdouble size;
gdouble em_size; gdouble em_size;
EekRenderer *renderer; EekRenderer *renderer;
PangoFontDescription *base_font;
}; };
typedef struct _CalculateFontSizeCallbackData CalculateFontSizeCallbackData; typedef struct _CalculateFontSizeCallbackData CalculateFontSizeCallbackData;
@ -354,7 +355,6 @@ calculate_font_size_key_callback (EekElement *element, gpointer user_data)
EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(data->renderer); EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(data->renderer);
gdouble sx, sy; gdouble sx, sy;
PangoFontDescription *font; PangoFontDescription *font;
const PangoFontDescription *base_font;
PangoRectangle extents = { 0, }; PangoRectangle extents = { 0, };
PangoLayout *layout; PangoLayout *layout;
gdouble size; gdouble size;
@ -369,8 +369,7 @@ calculate_font_size_key_callback (EekElement *element, gpointer user_data)
if (!label) if (!label)
label = "M"; label = "M";
base_font = pango_context_get_font_description (priv->pcontext); font = pango_font_description_copy (data->base_font);
font = pango_font_description_copy (base_font);
eek_element_get_bounds (element, &bounds); eek_element_get_bounds (element, &bounds);
size = eek_bounds_long_side (&bounds) * PANGO_SCALE; size = eek_bounds_long_side (&bounds) * PANGO_SCALE;
@ -391,7 +390,7 @@ calculate_font_size_key_callback (EekElement *element, gpointer user_data)
sy = bounds.height * PANGO_SCALE / extents.height; sy = bounds.height * PANGO_SCALE / extents.height;
size *= MIN(sx, sy); size *= MIN(sx, sy);
if (size >= pango_font_description_get_size (base_font)) { if (size >= pango_font_description_get_size (data->base_font)) {
if (size < data->size) if (size < data->size)
data->size = size; data->size = size;
if (size < data->em_size) if (size < data->em_size)
@ -408,16 +407,15 @@ calculate_font_size_section_callback (EekElement *element, gpointer user_data)
} }
static gdouble static gdouble
calculate_font_size (EekRenderer *renderer) calculate_font_size (EekRenderer *renderer, PangoFontDescription *base_font)
{ {
EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(renderer); EekRendererPrivate *priv = EEK_RENDERER_GET_PRIVATE(renderer);
CalculateFontSizeCallbackData data; CalculateFontSizeCallbackData data;
PangoFontDescription *base_font;
base_font = pango_context_get_font_description (priv->pcontext);
data.size = G_MAXDOUBLE; data.size = G_MAXDOUBLE;
data.em_size = G_MAXDOUBLE; data.em_size = G_MAXDOUBLE;
data.renderer = renderer; data.renderer = renderer;
data.base_font = base_font;
eek_container_foreach_child (EEK_CONTAINER(priv->keyboard), eek_container_foreach_child (EEK_CONTAINER(priv->keyboard),
calculate_font_size_section_callback, calculate_font_size_section_callback,
&data); &data);
@ -566,8 +564,8 @@ eek_renderer_real_render_key_label (EekRenderer *self,
PangoFontDescription *base_font; PangoFontDescription *base_font;
gdouble size; gdouble size;
size = calculate_font_size (self);
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);
priv->font = pango_font_description_copy (base_font); priv->font = pango_font_description_copy (base_font);
pango_font_description_set_size (priv->font, size); pango_font_description_set_size (priv->font, size);
} }