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

Improve icon rendering.

Browse Source
This commit is contained in:
Daiki Ueno
2011-08-24 17:05:41 +09:00
parent 828b2d66d1
commit 0772898b83
3 changed files with 132 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
eek/eek-gtk-renderer.c
View File

@ -51,64 +51,27 @@ pixbuf_to_cairo_surface (GdkPixbuf *pixbuf)
return surface; return surface;
} }
static void static cairo_surface_t *
eek_gtk_renderer_real_render_key_icon (EekRenderer *self, eek_gtk_renderer_real_get_icon_surface (EekRenderer *self,
cairo_t *cr, const gchar *icon_name,
EekKey *key, gint size)
gdouble scale,
gboolean rotate)
{ {
EekBounds bounds;
EekSymbol *symbol;
const gchar *icon_name;
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
cairo_surface_t *surface;
GError *error; GError *error;
gint width, height; cairo_surface_t *surface;
symbol = eek_key_get_symbol_with_fallback (key, 0, 0);
g_return_if_fail (symbol);
icon_name = eek_symbol_get_icon_name (symbol);
g_return_if_fail (icon_name);
eek_element_get_bounds (EEK_ELEMENT(key), &bounds);
bounds.width *= scale;
bounds.height *= scale;
error = NULL; error = NULL;
pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
icon_name, icon_name,
MIN(bounds.width, bounds.height), size,
0, 0,
&error); &error);
g_return_if_fail (pixbuf); if (pixbuf == NULL)
return NULL;
width = gdk_pixbuf_get_width (pixbuf);
height = gdk_pixbuf_get_height (pixbuf);
if (bounds.height * width / bounds.width <= height)
scale = width / bounds.width;
else if (bounds.width * height / bounds.height <= width)
scale = height / bounds.height;
else {
if (bounds.width * height < bounds.height * width)
scale = bounds.width / width;
else
scale = bounds.height / height;
}
cairo_save (cr);
cairo_translate (cr,
(bounds.width - width * scale) / 2,
(bounds.height - height * scale) / 2);
eek_renderer_apply_transformation_for_key (self, cr, key, scale, rotate);
surface = pixbuf_to_cairo_surface (pixbuf); surface = pixbuf_to_cairo_surface (pixbuf);
g_object_unref (pixbuf); g_object_unref (pixbuf);
cairo_set_source_surface (cr, surface, 0.0, 0.0); return surface;
cairo_paint (cr);
cairo_restore (cr);
} }
static void static void
@ -116,7 +79,7 @@ eek_gtk_renderer_class_init (EekGtkRendererClass *klass)
{ {
EekRendererClass *renderer_class = EEK_RENDERER_CLASS (klass); EekRendererClass *renderer_class = EEK_RENDERER_CLASS (klass);
renderer_class->render_key_icon = eek_gtk_renderer_real_render_key_icon; renderer_class->get_icon_surface = eek_gtk_renderer_real_get_icon_surface;
} }
static void static void

86
eek/eek-renderer.c
View File

@ -440,8 +440,15 @@ render_key (EekRenderer *self,
gulong oref; gulong oref;
EekSymbol *symbol; EekSymbol *symbol;
GHashTable *outline_surface_cache; GHashTable *outline_surface_cache;
PangoLayout *layout;
PangoRectangle extents = { 0, };
EekColor foreground;
/* render outline */
eek_element_get_bounds (EEK_ELEMENT(key), &bounds); eek_element_get_bounds (EEK_ELEMENT(key), &bounds);
bounds.width *= priv->scale;
bounds.height *= priv->scale;
oref = eek_key_get_oref (key); oref = eek_key_get_oref (key);
if (oref == 0) if (oref == 0)
return; return;
@ -458,8 +465,8 @@ render_key (EekRenderer *self,
outline_surface = outline_surface =
cairo_image_surface_create (CAIRO_FORMAT_ARGB32, cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
bounds.width * priv->scale, bounds.width,
bounds.height * priv->scale); bounds.height);
cr = cairo_create (outline_surface); cr = cairo_create (outline_surface);
/* blank background */ /* blank background */
@ -481,15 +488,46 @@ render_key (EekRenderer *self,
cairo_set_source_surface (cr, outline_surface, 0.0, 0.0); cairo_set_source_surface (cr, outline_surface, 0.0, 0.0);
cairo_paint (cr); cairo_paint (cr);
/* render icon (if any) */
symbol = eek_key_get_symbol_with_fallback (key, 0, 0); symbol = eek_key_get_symbol_with_fallback (key, 0, 0);
if (EEK_RENDERER_GET_CLASS(self)->render_key_icon && if (!symbol)
symbol && eek_symbol_get_icon_name (symbol)) { return;
eek_renderer_render_key_icon (self, cr, key, 1.0, 0);
} else {
PangoLayout *layout;
PangoRectangle extents = { 0, };
EekColor foreground;
if (eek_symbol_get_icon_name (symbol)) {
cairo_surface_t *icon_surface =
eek_renderer_get_icon_surface (self,
eek_symbol_get_icon_name (symbol),
MIN(bounds.width, bounds.height));
if (icon_surface) {
gint width = cairo_image_surface_get_width (icon_surface);
gint height = cairo_image_surface_get_height (icon_surface);
gdouble scale;
if (height * bounds.width / width <= bounds.height)
scale = bounds.width / width;
else if (width * bounds.height / height <= bounds.width)
scale = bounds.height / height;
else {
if (width * bounds.height < height * bounds.width)
scale = width / bounds.width;
else
scale = height / bounds.height;
}
cairo_save (cr);
cairo_translate (cr,
(bounds.width - width * scale) / 2,
(bounds.height - height * scale) / 2);
cairo_rectangle (cr, 0, 0, width, height);
cairo_clip (cr);
cairo_set_source_surface (cr, icon_surface, 0.0, 0.0);
cairo_paint (cr);
cairo_restore (cr);
return;
}
}
/* render label */
layout = pango_cairo_create_layout (cr); layout = pango_cairo_create_layout (cr);
eek_renderer_render_key_label (self, layout, key); eek_renderer_render_key_label (self, layout, key);
pango_layout_get_extents (layout, NULL, &extents); pango_layout_get_extents (layout, NULL, &extents);
@ -497,8 +535,8 @@ render_key (EekRenderer *self,
cairo_save (cr); cairo_save (cr);
cairo_move_to cairo_move_to
(cr, (cr,
(bounds.width * priv->scale - extents.width / PANGO_SCALE) / 2, (bounds.width - extents.width / PANGO_SCALE) / 2,
(bounds.height * priv->scale - extents.height / PANGO_SCALE) / 2); (bounds.height - extents.height / PANGO_SCALE) / 2);
eek_renderer_get_foreground_color (self, EEK_ELEMENT(key), &foreground); eek_renderer_get_foreground_color (self, EEK_ELEMENT(key), &foreground);
cairo_set_source_rgba (cr, cairo_set_source_rgba (cr,
@ -510,7 +548,6 @@ render_key (EekRenderer *self,
pango_cairo_show_layout (cr, layout); pango_cairo_show_layout (cr, layout);
cairo_restore (cr); cairo_restore (cr);
g_object_unref (layout); g_object_unref (layout);
}
} }
void void
@ -1040,22 +1077,19 @@ eek_renderer_render_key_outline (EekRenderer *renderer,
rotate); rotate);
} }
void cairo_surface_t *
eek_renderer_render_key_icon (EekRenderer *renderer, eek_renderer_get_icon_surface (EekRenderer *renderer,
cairo_t *cr, const gchar *icon_name,
EekKey *key, gint size)
gdouble scale,
gboolean rotate)
{ {
g_return_if_fail (EEK_IS_RENDERER(renderer)); EekRendererClass *klass;
g_return_if_fail (EEK_IS_KEY(key));
g_return_if_fail (scale >= 0.0);
EEK_RENDERER_GET_CLASS(renderer)->render_key_icon (renderer, g_return_val_if_fail (EEK_IS_RENDERER(renderer), NULL);
cr,
key, klass = EEK_RENDERER_GET_CLASS(renderer);
scale, if (klass->get_icon_surface)
rotate); return klass->get_icon_surface (renderer, icon_name, size);
return NULL;
} }
void void

34
eek/eek-renderer.h
View File

@ -70,11 +70,9 @@ struct _EekRendererClass
void (* render_keyboard) (EekRenderer *self, void (* render_keyboard) (EekRenderer *self,
cairo_t *cr); cairo_t *cr);
void (* render_key_icon) (EekRenderer *self, cairo_surface_t *(* get_icon_surface) (EekRenderer *self,
cairo_t *cr, const gchar *icon_name,
EekKey *key, gint size);
gdouble scale,
gboolean rotate);
/*< private >*/ /*< private >*/
/* padding */ /* padding */
@ -84,7 +82,8 @@ struct _EekRendererClass
GType eek_renderer_get_type (void) G_GNUC_CONST; GType eek_renderer_get_type (void) G_GNUC_CONST;
EekRenderer *eek_renderer_new (EekKeyboard *keyboard, EekRenderer *eek_renderer_new (EekKeyboard *keyboard,
PangoContext *pcontext); PangoContext *pcontext);
void eek_renderer_set_allocation_size (EekRenderer *renderer, void eek_renderer_set_allocation_size
(EekRenderer *renderer,
gdouble width, gdouble width,
gdouble height); gdouble height);
void eek_renderer_get_size (EekRenderer *renderer, void eek_renderer_get_size (EekRenderer *renderer,
@ -97,12 +96,14 @@ void eek_renderer_get_key_bounds (EekRenderer *renderer,
gdouble eek_renderer_get_scale (EekRenderer *renderer); gdouble eek_renderer_get_scale (EekRenderer *renderer);
PangoLayout *eek_renderer_create_pango_layout (EekRenderer *renderer); PangoLayout *eek_renderer_create_pango_layout
(EekRenderer *renderer);
void eek_renderer_render_key_label (EekRenderer *renderer, void eek_renderer_render_key_label (EekRenderer *renderer,
PangoLayout *layout, PangoLayout *layout,
EekKey *key); EekKey *key);
void eek_renderer_render_key_outline (EekRenderer *renderer, void eek_renderer_render_key_outline
(EekRenderer *renderer,
cairo_t *cr, cairo_t *cr,
EekKey *key, EekKey *key,
gdouble scale, gdouble scale,
@ -114,11 +115,9 @@ void eek_renderer_render_key (EekRenderer *renderer,
gdouble scale, gdouble scale,
gboolean rotate); gboolean rotate);
void eek_renderer_render_key_icon (EekRenderer *renderer, cairo_surface_t *eek_renderer_get_icon_surface (EekRenderer *renderer,
cairo_t *cr, const gchar *icon_name,
EekKey *key, gint size);
gdouble scale,
gboolean rotate);
void eek_renderer_render_keyboard (EekRenderer *renderer, void eek_renderer_render_keyboard (EekRenderer *renderer,
cairo_t *cr); cairo_t *cr);
@ -129,10 +128,12 @@ void eek_renderer_set_default_foreground_color
void eek_renderer_set_default_background_color void eek_renderer_set_default_background_color
(EekRenderer *renderer, (EekRenderer *renderer,
const EekColor *color); const EekColor *color);
void eek_renderer_get_foreground_color (EekRenderer *renderer, void eek_renderer_get_foreground_color
(EekRenderer *renderer,
EekElement *element, EekElement *element,
EekColor *color); EekColor *color);
void eek_renderer_get_background_color (EekRenderer *renderer, void eek_renderer_get_background_color
(EekRenderer *renderer,
EekElement *element, EekElement *element,
EekColor *color); EekColor *color);
void eek_renderer_get_background_gradient void eek_renderer_get_background_gradient
@ -143,7 +144,8 @@ void eek_renderer_get_background_gradient
EekColor *end); EekColor *end);
void eek_renderer_set_border_width (EekRenderer *renderer, void eek_renderer_set_border_width (EekRenderer *renderer,
gdouble border_width); gdouble border_width);
EekKey *eek_renderer_find_key_by_position (EekRenderer *renderer, EekKey *eek_renderer_find_key_by_position
(EekRenderer *renderer,
gdouble x, gdouble x,
gdouble y); gdouble y);
void eek_renderer_apply_transformation_for_key void eek_renderer_apply_transformation_for_key