diff options
| author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2016-07-26 15:22:31 +0900 |
|---|---|---|
| committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2016-07-26 15:24:13 +0900 |
| commit | 1b8643b9a00812f3362eafbf53ac5d70e6a0601e (patch) | |
| tree | 4d15eb5d47bb94d6c0c16972d7a629f8460a0300 | |
| parent | e3ed888aa994d96007da15be89649a92c12bcbae (diff) | |
| download | efl-1b8643b9a00812f3362eafbf53ac5d70e6a0601e.tar.gz | |
efl ui image - fix view size get to NOT apply scaling
this fixes T3254
| -rw-r--r-- | src/lib/elementary/efl_ui_image.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index e65b95c510..8bf16a894f 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; } |