enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

image now implements edje object size functions 

Edje.Object.size_min.get;
      Edje.Object.size_max.get;
      Edje.Object.size_min_calc;
      Edje.Object.calc_force;

fixes all image-in-edje sizing issues/errors
This commit is contained in:
Mike Blumenkrantz 2015-01-21 15:15:43 -05:00
parent af7cfe1d6b
commit 0db8a01ab1
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
legacy/elementary/src/lib/elm_image.c
View File

@ -841,6 +841,40 @@ _elm_image_edje_object_signal_emit(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, cons
edje_object_signal_emit(sd->img, emission, source);
}
EOLIAN static void
_elm_image_edje_object_size_min_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, int *w, int *h)
{
if (sd->edje)
edje_object_size_min_get(sd->img, w, h);
else
evas_object_size_hint_min_get(sd->img, w, h);
}
EOLIAN static void
_elm_image_edje_object_size_max_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, int *w, int *h)
{
if (sd->edje)
edje_object_size_max_get(sd->img, w, h);
else
evas_object_size_hint_max_get(sd->img, w, h);
}
EOLIAN static void
_elm_image_edje_object_calc_force(Eo *obj EINA_UNUSED, Elm_Image_Data *sd)
{
if (sd->edje)
edje_object_calc_force(sd->img);
}
EOLIAN static void
_elm_image_edje_object_size_min_calc(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, int *w, int *h)
{
if (sd->edje)
edje_object_size_min_calc(sd->img, w, h);
else
evas_object_size_hint_min_get(sd->img, w, h);
}
EOLIAN static Eina_Bool
_elm_image_mmap_set(Eo *obj, Elm_Image_Data *sd, const Eina_File *f, const char *key)
{

4
legacy/elementary/src/lib/elm_image.eo
View File

@ -543,6 +543,10 @@ class Elm_Image (Elm_Widget, Efl.File, Efl.Image, Evas.Clickable_Interface,
Efl.Image.smooth_scale.set;
Efl.Image.smooth_scale.get;
Edje.Object.signal_emit;
Edje.Object.size_min.get;
Edje.Object.size_max.get;
Edje.Object.size_min_calc;
Edje.Object.calc_force;
Evas.Object_Smart.hide;
Evas.Object_Smart.clip.set;
Evas.Object_Smart.clip_unset;