From: Carsten Haitzler Date: Tue, 22 Sep 2009 11:06:26 +0000 (+0000) Subject: can use specific zoom level now just fine... need to make it dynamic next X-Git-Tag: v1.0.0~5226 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2a2e3a917eced9c1adfd81a61583d76e84b3cef0;p=platform%2Fupstream%2Felementary.git can use specific zoom level now just fine... need to make it dynamic next SVN revision: 42618 --- diff --git a/src/bin/test_photocam.c b/src/bin/test_photocam.c index e9cea78..811a77a 100644 --- a/src/bin/test_photocam.c +++ b/src/bin/test_photocam.c @@ -26,7 +26,7 @@ test_photocam(void *data, Evas_Object *obj, void *event_info) evas_object_size_hint_weight_set(ph, 1.0, 1.0); elm_win_resize_object_add(win, ph); - elm_photocam_file_set(ph, img[3]); + elm_photocam_file_set(ph, img[1]); evas_object_show(ph); diff --git a/src/lib/elm_photocam.c b/src/lib/elm_photocam.c index a8f54c5..02983cf 100644 --- a/src/lib/elm_photocam.c +++ b/src/lib/elm_photocam.c @@ -226,10 +226,10 @@ grid_load(Evas_Object *obj) evas_object_image_file_set(wd->grid.grid[tn].img[loadnum], NULL, NULL); evas_object_image_load_scale_down_set(wd->grid.grid[tn].img[loadnum], wd->grid.zoom); evas_object_image_load_region_set(wd->grid.grid[tn].img[loadnum], - wd->grid.grid[tn].src.x, - wd->grid.grid[tn].src.y, - wd->grid.grid[tn].src.w, - wd->grid.grid[tn].src.h); + wd->grid.grid[tn].src.x / wd->grid.zoom, + wd->grid.grid[tn].src.y / wd->grid.zoom, + wd->grid.grid[tn].src.w / wd->grid.zoom, + wd->grid.grid[tn].src.h / wd->grid.zoom); // evas_object_image_pixels_dirty_set(wd->grid.grid[tn].img[loadnum], 1); evas_object_image_file_set(wd->grid.grid[tn].img[loadnum], wd->file, NULL); evas_object_image_preload(wd->grid.grid[tn].img[loadnum], 0); @@ -362,8 +362,8 @@ _calc_job(void *data) Widget_Data *wd = data; Evas_Coord minw, minh; - minw = wd->grid.w; - minh = wd->grid.h; + minw = wd->grid.w / wd->grid.zoom; + minh = wd->grid.h / wd->grid.zoom; if ((minw != wd->minw) || (minh != wd->minh)) {