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

Use "M" to calculate font size if a keyboard has no letter key.

Browse Source
This commit is contained in:
Daiki Ueno
2011-01-29 10:59:34 +09:00
parent 6a063c9d76
commit a7b276c3c4
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
eek/eek-renderer.c
View File

@ -254,6 +254,7 @@ render_key_outline (EekRenderer *renderer,
struct _CalculateFontSizeCallbackData { struct _CalculateFontSizeCallbackData {
gdouble size; gdouble size;
gdouble em_size;
EekRenderer *renderer; EekRenderer *renderer;
}; };
typedef struct _CalculateFontSizeCallbackData CalculateFontSizeCallbackData; typedef struct _CalculateFontSizeCallbackData CalculateFontSizeCallbackData;
@ -271,16 +272,14 @@ calculate_font_size_key_callback (EekElement *element, gpointer user_data)
gdouble size; gdouble size;
EekSymbol *symbol; EekSymbol *symbol;
EekBounds bounds; EekBounds bounds;
gchar *label; gchar *label = NULL;
symbol = eek_key_get_symbol (EEK_KEY(element)); symbol = eek_key_get_symbol (EEK_KEY(element));
if (!symbol || if (symbol &&
eek_symbol_get_category (symbol) != EEK_SYMBOL_CATEGORY_LETTER) eek_symbol_get_category (symbol) == EEK_SYMBOL_CATEGORY_LETTER)
return; label = eek_symbol_get_label (symbol);
label = eek_symbol_get_label (symbol);
if (!label) if (!label)
return; label = g_strdup ("M");
base_font = pango_context_get_font_description (priv->pcontext); base_font = pango_context_get_font_description (priv->pcontext);
font = pango_font_description_copy (base_font); font = pango_font_description_copy (base_font);
@ -305,9 +304,12 @@ 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 < data->size && if (size >= pango_font_description_get_size (base_font)) {
size >= pango_font_description_get_size (base_font)) if (size < data->size)
data->size = size; data->size = size;
if (size < data->em_size)
data->em_size = size;
}
} }
static void static void
@ -327,11 +329,12 @@ calculate_font_size (EekRenderer *renderer)
base_font = pango_context_get_font_description (priv->pcontext); base_font = pango_context_get_font_description (priv->pcontext);
data.size = G_MAXDOUBLE; data.size = G_MAXDOUBLE;
data.em_size = G_MAXDOUBLE;
data.renderer = renderer; data.renderer = renderer;
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);
return data.size; return data.size > 0 ? data.size : data.em_size;
} }
static void static void
@ -1026,10 +1029,11 @@ eek_renderer_find_key_by_position (EekRenderer *renderer,
priv = EEK_RENDERER_GET_PRIVATE(renderer); priv = EEK_RENDERER_GET_PRIVATE(renderer);
eek_element_get_bounds (EEK_ELEMENT(priv->keyboard), &bounds); eek_element_get_bounds (EEK_ELEMENT(priv->keyboard), &bounds);
g_assert (x >= bounds.x * priv->scale); if (x < bounds.x * priv->scale ||
g_assert (y >= bounds.y * priv->scale); y < bounds.y * priv->scale ||
g_assert (x <= bounds.width * priv->scale); x > bounds.width * priv->scale ||
g_assert (y <= bounds.height * priv->scale); y > bounds.height * priv->scale)
return NULL;
data.point.x = x; data.point.x = x;
data.point.y = y; data.point.y = y;