From a40e37be620723a1b6ed32ec444b513445fcaed4 Mon Sep 17 00:00:00 2001 From: cedric Date: Wed, 4 May 2011 14:11:12 +0000 Subject: [PATCH] elementary: fix aspect ratio of thumbnail. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@59192 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/bin/test_thumb.c | 6 ++++-- src/lib/elm_thumb.c | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/bin/test_thumb.c b/src/bin/test_thumb.c index 8405525..490914b 100644 --- a/src/bin/test_thumb.c +++ b/src/bin/test_thumb.c @@ -9,7 +9,7 @@ test_thumb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info Evas_Object *win, *bg, *sc, *tb, *th; int i, j, n; char buf[PATH_MAX]; - const char *img[9] = + const char *img[11] = { "panel_01.jpg", "plant_01.jpg", @@ -20,6 +20,8 @@ test_thumb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info "sky_03.jpg", "sky_04.jpg", "wood_01.jpg", + "mystrale.jpg", + "mystrale_2.jpg" }; elm_need_ethumb(); @@ -44,7 +46,7 @@ test_thumb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info th = elm_thumb_add(win); snprintf(buf, sizeof(buf), "%s/images/%s", PACKAGE_DATA_DIR, img[n]); - n = (n + 1) % 9; + n = (n + 1) % 11; elm_thumb_file_set(th, buf, img[n]); evas_object_size_hint_weight_set(th, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/src/lib/elm_thumb.c b/src/lib/elm_thumb.c index 7b6a23d..a55bf13 100644 --- a/src/lib/elm_thumb.c +++ b/src/lib/elm_thumb.c @@ -172,7 +172,12 @@ static void _thumb_ready(Widget_Data *wd, const char *thumb_path, const char *thumb_key) { Evas_Coord mw, mh; + Evas_Coord aw, ah; + evas_object_image_size_get(wd->view, &aw, &ah); + evas_object_size_hint_aspect_set(wd->view, + EVAS_ASPECT_CONTROL_BOTH, + aw, ah); edje_object_part_swallow(wd->frame, "elm.swallow.content", wd->view); edje_object_size_min_get(wd->frame, &mw, &mh); edje_object_size_min_restricted_calc(wd->frame, &mw, &mh, mw, mh); -- 2.7.4