summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-07-26 15:22:31 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-07-26 15:24:13 +0900
commit1b8643b9a00812f3362eafbf53ac5d70e6a0601e (patch)
tree4d15eb5d47bb94d6c0c16972d7a629f8460a0300
parente3ed888aa994d96007da15be89649a92c12bcbae (diff)
efl ui image - fix view size get to NOT apply scaling
this fixes T3254
-rw-r--r--src/lib/elementary/efl_ui_image.c9
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 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
1158_efl_ui_image_efl_gfx_view_view_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, int *w, int *h) 1158_efl_ui_image_efl_gfx_view_view_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Data *sd, int *w, int *h)
1159{ 1159{
1160 int tw, th; 1160 int tw, th;
1161 int cw = 0, ch = 0;
1162 1161
1163 if (w) *w = 0; 1162 if (w) *w = 0;
1164 if (h) *h = 0; 1163 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
1167 edje_object_size_min_get(sd->img, &tw, &th); 1166 edje_object_size_min_get(sd->img, &tw, &th);
1168 else 1167 else
1169 evas_object_image_size_get(sd->img, &tw, &th); 1168 evas_object_image_size_get(sd->img, &tw, &th);
1170
1171 if ((sd->scale_up) || (sd->scale_down))
1172 evas_object_geometry_get(sd->img, NULL, NULL, &cw, &ch);
1173
1174 tw = tw > cw ? tw : cw;
1175 th = th > ch ? th : ch;
1176 tw = ((double)tw) * sd->scale;
1177 th = ((double)th) * sd->scale;
1178 if (w) *w = tw; 1169 if (w) *w = tw;
1179 if (h) *h = th; 1170 if (h) *h = th;
1180} 1171}