raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1b8643b9a00812f3362eafbf53ac5d70e6a0601e
commit 1b8643b9a00812f3362eafbf53ac5d70e6a0601e Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Tue Jul 26 15:22:31 2016 +0900 efl ui image - fix view size get to NOT apply scaling this fixes T3254 --- src/lib/elementary/efl_ui_image.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index e65b95c..8bf16a8 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c @@ -1158,7 +1158,6 @@ EOLIAN static void _efl_ui_image_efl_gfx_view_view_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, int *w, int *h) { int tw, th; - int cw = 0, ch = 0; if (w) *w = 0; if (h) *h = 0; @@ -1167,14 +1166,6 @@ _efl_ui_image_efl_gfx_view_view_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data edje_object_size_min_get(sd->img, &tw, &th); else evas_object_image_size_get(sd->img, &tw, &th); - - if ((sd->scale_up) || (sd->scale_down)) - evas_object_geometry_get(sd->img, NULL, NULL, &cw, &ch); - - tw = tw > cw ? tw : cw; - th = th > ch ? th : ch; - tw = ((double)tw) * sd->scale; - th = ((double)th) * sd->scale; if (w) *w = tw; if (h) *h = th; } --
