summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_image.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/elementary/efl_ui_image.c')
-rw-r--r--src/lib/elementary/efl_ui_image.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index abfc21e..34d5ac7 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -767,7 +767,7 @@ _efl_ui_image_sizing_eval(Evas_Object *obj)
767 efl_gfx_view_size_get(obj, &w, &h); 767 efl_gfx_view_size_get(obj, &w, &h);
768 768
769 sd->scale = ts; 769 sd->scale = ts;
770 efl_gfx_size_hint_combined_min_get(obj, &minw, &minh); 770 evas_object_size_hint_combined_min_get(obj, &minw, &minh);
771 771
772 if (sd->no_scale) 772 if (sd->no_scale)
773 { 773 {
@@ -1171,7 +1171,10 @@ _efl_ui_image_efl_canvas_layout_group_group_size_min_get(Eo *obj EINA_UNUSED, Ef
1171 if (sd->edje) 1171 if (sd->edje)
1172 edje_object_size_min_get(sd->img, w, h); 1172 edje_object_size_min_get(sd->img, w, h);
1173 else 1173 else
1174 efl_gfx_size_hint_combined_min_get(sd->img, w, h); 1174 {
1175 if (w) *w = 0;
1176 if (h) *h = 0;
1177 }
1175} 1178}
1176 1179
1177EOLIAN static void 1180EOLIAN static void
@@ -1180,7 +1183,10 @@ _efl_ui_image_efl_canvas_layout_group_group_size_max_get(Eo *obj EINA_UNUSED, Ef
1180 if (sd->edje) 1183 if (sd->edje)
1181 edje_object_size_max_get(sd->img, w, h); 1184 edje_object_size_max_get(sd->img, w, h);
1182 else 1185 else
1183 evas_object_size_hint_max_get(sd->img, w, h); 1186 {
1187 if (w) *w = 0;
1188 if (h) *h = 0;
1189 }
1184} 1190}
1185 1191
1186EOLIAN static void 1192EOLIAN static void
@@ -1196,7 +1202,7 @@ _efl_ui_image_efl_canvas_layout_calc_calc_size_min(Eo *obj EINA_UNUSED, Efl_Ui_I
1196 if (sd->edje) 1202 if (sd->edje)
1197 edje_object_size_min_calc(sd->img, w, h); 1203 edje_object_size_min_calc(sd->img, w, h);
1198 else 1204 else
1199 efl_gfx_size_hint_combined_min_get(sd->img, w, h); 1205 evas_object_size_hint_combined_min_get(sd->img, w, h);
1200} 1206}
1201 1207
1202EOLIAN static void 1208EOLIAN static void