aboutsummaryrefslogtreecommitdiffstats
path: root/src/bin/e_widget_image.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-08-25 14:47:04 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-08-25 14:47:10 -0400
commit28783cfc23b455648289570292407580435ed6a4 (patch)
treef2ce654bc6125e834511088940e13bb7c06f41f4 /src/bin/e_widget_image.c
parentuse client geometry for fileman popup positioning instead of win object geometry (diff)
downloadenlightenment-28783cfc23b455648289570292407580435ed6a4.tar.gz
use evas size hints for image widget internals if internal obj is not edje obj
Diffstat (limited to 'src/bin/e_widget_image.c')
-rw-r--r--src/bin/e_widget_image.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/bin/e_widget_image.c b/src/bin/e_widget_image.c
index 2196ae3a7..aead92250 100644
--- a/src/bin/e_widget_image.c
+++ b/src/bin/e_widget_image.c
@@ -32,7 +32,10 @@ e_widget_image_add_from_object(Evas *evas, Evas_Object *object, int minw, int mi
e_widget_can_focus_set(obj, 0);
wd->minw = minw <= 0 ? minw : 0;
wd->minh = minh <= 0 ? minh : 0;
- edje_object_size_min_get(object, &mw, &mh);
+ if (isedje(object))
+ edje_object_size_min_get(object, &mw, &mh);
+ else
+ evas_object_size_hint_min_get(object, &mw, &mh);
if (minw || minh)
e_widget_size_min_set(obj, minw, minh);
else