diff options
author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2017-08-23 14:24:11 -0400 |
---|---|---|
committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2017-08-25 14:48:12 -0400 |
commit | 77455208525dfc1ecbee9d3eb65459f514ee0b1a (patch) | |
tree | 77e2c402e4f1ac32e6eb9e8dc65bee643735a6db | |
parent | 8dbea4a709fccbb8a79ac92c1c796289964c5e35 (diff) | |
download | efl-77455208525dfc1ecbee9d3eb65459f514ee0b1a.tar.gz |
efl_ui_image: maintain geometry for prev image while preloading new image
if prev_img exists then it is visible, so continue maintaining its geometry
until it is deleted
fix T5936
@fix
-rw-r--r-- | src/lib/elementary/efl_ui_image.c | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c index e123e9c679..c62ae92f3a 100644 --- a/src/lib/elementary/efl_ui_image.c +++ b/src/lib/elementary/efl_ui_image.c @@ -151,14 +151,13 @@ _img_new(Evas_Object *obj) } static void -_efl_ui_image_internal_sizing_eval(Evas_Object *obj, Efl_Ui_Image_Data *sd) +_image_sizing_eval(Efl_Ui_Image_Data *sd, Evas_Object *img) { - if (!sd->img) return; - if (efl_isa(sd->img, EDJE_OBJECT_CLASS)) + if (efl_isa(img, EDJE_OBJECT_CLASS)) { - evas_object_move(sd->img, sd->img_x, sd->img_y); - evas_object_resize(sd->img, sd->img_w, sd->img_h); + evas_object_move(img, sd->img_x, sd->img_y); + evas_object_resize(img, sd->img_w, sd->img_h); evas_object_move(sd->hit_rect, sd->img_x, sd->img_y); evas_object_resize(sd->hit_rect, sd->img_w, sd->img_h); @@ -170,7 +169,7 @@ _efl_ui_image_internal_sizing_eval(Evas_Object *obj, Efl_Ui_Image_Data *sd) int iw = 0, ih = 0, offset_x = 0, offset_y = 0; //1. Get the original image size (iw x ih) - evas_object_image_size_get(sd->img, &iw, &ih); + evas_object_image_size_get(img, &iw, &ih); iw = ((double)iw) * sd->scale; ih = ((double)ih) * sd->scale; @@ -226,14 +225,14 @@ _efl_ui_image_internal_sizing_eval(Evas_Object *obj, Efl_Ui_Image_Data *sd) } //3. Calculate offset according to align value - if (!elm_widget_is_legacy(obj)) + if (!elm_widget_is_legacy(sd->self)) { offset_x = ((sd->img_w - w) * sd->align_x); offset_y = ((sd->img_h - h) * sd->align_y); } else { - evas_object_size_hint_align_get(obj, &alignh, &alignv); + evas_object_size_hint_align_get(sd->self, &alignh, &alignv); if (EINA_DBL_EQ(alignh, EVAS_HINT_FILL)) alignh = 0.5; if (EINA_DBL_EQ(alignv, EVAS_HINT_FILL)) alignv = 0.5; @@ -248,7 +247,7 @@ _efl_ui_image_internal_sizing_eval(Evas_Object *obj, Efl_Ui_Image_Data *sd) if (offset_x >= 0) offset_x = 0; if (offset_y >= 0) offset_y = 0; - evas_object_image_fill_set(sd->img, offset_x, offset_y, w, h); + evas_object_image_fill_set(img, offset_x, offset_y, w, h); if (offset_x < 0) { @@ -261,14 +260,22 @@ _efl_ui_image_internal_sizing_eval(Evas_Object *obj, Efl_Ui_Image_Data *sd) h = sd->img_h; } - evas_object_move(sd->img, x, y); - evas_object_resize(sd->img, w, h); + evas_object_move(img, x, y); + evas_object_resize(img, w, h); evas_object_move(sd->hit_rect, x, y); evas_object_resize(sd->hit_rect, w, h); } } +static void +_efl_ui_image_internal_sizing_eval(Evas_Object *obj EINA_UNUSED, Efl_Ui_Image_Data *sd) +{ + if (!sd->img) return; + _image_sizing_eval(sd, sd->img); + if (sd->prev_img) _image_sizing_eval(sd, sd->prev_img); +} + static inline void _async_open_data_free(Async_Open_Data *data) { |