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

Fix fit-size calculation.

Browse Source
This commit is contained in:
Daiki Ueno
2011-08-18 18:06:52 +09:00
parent 860fbe8ede
commit 383c93a415
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,10 +87,16 @@ eek_gtk_renderer_real_render_key_icon (EekRenderer *self,
width = gdk_pixbuf_get_width (pixbuf); width = gdk_pixbuf_get_width (pixbuf);
height = gdk_pixbuf_get_height (pixbuf); height = gdk_pixbuf_get_height (pixbuf);
if (bounds.width * height < bounds.height * width) if (bounds.height * width / bounds.width <= height)
scale = bounds.width / width; scale = width / bounds.width;
else else if (bounds.width * height / bounds.height <= width)
scale = bounds.height / height; 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_save (cr);
cairo_translate (cr, cairo_translate (cr,

13
eek/eek-renderer.c
View File

@ -880,8 +880,17 @@ eek_renderer_set_allocation_size (EekRenderer *renderer,
priv->allocation_height = height; priv->allocation_height = height;
eek_element_get_bounds (EEK_ELEMENT(priv->keyboard), &bounds); eek_element_get_bounds (EEK_ELEMENT(priv->keyboard), &bounds);
scale = width > height ? height / bounds.height :
width / bounds.width; 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;
}
if (scale != priv->scale) { if (scale != priv->scale) {
priv->scale = scale; priv->scale = scale;