[EGIT] [core/efl] master 01/01: efl.ui.image.zoomable: Add missing edje.group_size_min/max_get

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=0787b739cddd1df0bc33312d0f048e308e509373

commit 0787b739cddd1df0bc33312d0f048e308e509373
Author: Amitesh Singh <amitesh...@samsung.com>
Date:   Thu Jul 27 19:03:51 2017 +0900

    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.
---
 src/lib/elementary/efl_ui_image_zoomable.c  | 18 ++++++++++++++++++
 src/lib/elementary/efl_ui_image_zoomable.eo |  2 ++
 2 files changed, 20 insertions(+)

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]]

--