diff options
| author | Amitesh Singh <amitesh.sh@samsung.com> | 2017-07-27 19:03:51 +0900 |
|---|---|---|
| committer | Amitesh Singh <amitesh.sh@samsung.com> | 2017-07-27 19:06:27 +0900 |
| commit | 0787b739cddd1df0bc33312d0f048e308e509373 (patch) | |
| tree | 02f79a020b96c14cd0ba89025aa2b5efbb00d644 | |
| parent | 936ea58cb9ac3e93aaabb6ec731fc3845cf95826 (diff) | |
| download | efl-0787b739cddd1df0bc33312d0f048e308e509373.tar.gz | |
efl.ui.image.zoomable: Add missing edje.group_size_min/max_get
This supresses the warnings when photocam is used as
an external edje object.
| -rw-r--r-- | src/lib/elementary/efl_ui_image_zoomable.c | 18 | ||||
| -rw-r--r-- | src/lib/elementary/efl_ui_image_zoomable.eo | 2 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c index 21a27e779e..6bc07a9a90 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.c +++ b/src/lib/elementary/efl_ui_image_zoomable.c @@ -1570,6 +1570,24 @@ _efl_ui_image_zoomable_efl_image_image_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Imag if (h) *h = pd->size.imh; } +EOLIAN static void +_efl_ui_image_zoomable_edje_object_group_size_min_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd, int *w, int *h) +{ + if (sd->edje) + edje_object_size_min_get(sd->edje, w, h); + else + efl_gfx_size_hint_combined_min_get(sd->img, w, h); +} + +EOLIAN static void +_efl_ui_image_zoomable_edje_object_group_size_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Image_Zoomable_Data *sd, int *w, int *h) +{ + if (sd->edje) + edje_object_size_max_get(sd->edje, w, h); + else + evas_object_size_hint_max_get(sd->img, w, h); +} + static Eina_Bool _img_proxy_set(Evas_Object *obj, Efl_Ui_Image_Zoomable_Data *sd, const char *file, const Eina_File *f, const char *group, diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo index dc16c10a58..8eecca7dac 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.eo +++ b/src/lib/elementary/efl_ui_image_zoomable.eo @@ -68,6 +68,8 @@ class Efl.Ui.Image.Zoomable (Elm.Widget, Efl.Ui.Image, Efl.Ui.Zoom, Efl.File.file { get; set; } Efl.Orientation.orientation { get; set; } Efl.Flipable.flip { get; set; } + Edje.Object.group_size_min { get; } + Edje.Object.group_size_max { get; } } events { press; [[Called when photocam got pressed]] |