hermet pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=966fffe0c6e3af0b7e65c3e3d145940f96b1f03a
commit 966fffe0c6e3af0b7e65c3e3d145940f96b1f03a Author: woochanlee <[email protected]> Date: Sat Oct 11 00:17:21 2014 +0900 bg: fix the _elm_bg_elm_layout_sizing_eval bug. Summary: Since the sd->image is swallowed to the edje object, it's position and size will be managed by edje smart object. in the bg side, it doesn't need to care the position and size of the image. @fix Reviewers: Hermet Differential Revision: https://phab.enlightenment.org/D1525 --- AUTHORS | 1 + src/lib/elm_bg.c | 17 ++--------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/AUTHORS b/AUTHORS index 188edbc..ec475be 100644 --- a/AUTHORS +++ b/AUTHORS @@ -158,3 +158,4 @@ Savio Sena <[email protected]> Jae Yong Hwang <[email protected]> Kabeer Khan <[email protected]> yinsc <[email protected]> +Woochan Lee <[email protected]> diff --git a/src/lib/elm_bg.c b/src/lib/elm_bg.c index 03d2645..b791fe0 100644 --- a/src/lib/elm_bg.c +++ b/src/lib/elm_bg.c @@ -28,7 +28,6 @@ _elm_bg_elm_layout_sizing_eval(Eo *obj, Elm_Bg_Data *sd) Evas_Coord iw = 0, ih = 0, mw = -1, mh = -1; Evas_Coord bx = 0, by = 0, bw = 0, bh = 0; Evas_Coord fx = 0, fy = 0, fw = 0, fh = 0; - Evas_Coord nx = 0, ny = 0, nw = 0, nh = 0; const char *p; ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); @@ -44,21 +43,11 @@ _elm_bg_elm_layout_sizing_eval(Eo *obj, Elm_Bg_Data *sd) evas_object_geometry_get (wd->resize_obj, &bx, &by, &bw, &bh); - /* set some defaults */ - nx = bx; - ny = by; - nw = bw; - nh = bh; - switch (sd->option) { case ELM_BG_OPTION_CENTER: - fw = nw = iw; - fh = nh = ih; - nx = ((bw - fw) / 2); - ny = ((bh - fh) / 2); - mw = iw; - mh = ih; + fw = mw = iw; + fh = mh = ih; break; case ELM_BG_OPTION_SCALE: @@ -85,8 +74,6 @@ _elm_bg_elm_layout_sizing_eval(Eo *obj, Elm_Bg_Data *sd) break; } - evas_object_move(sd->img, nx, ny); - evas_object_resize(sd->img, nw, nh); evas_object_image_fill_set(sd->img, fx, fy, fw, fh); evas_object_size_hint_min_set(sd->img, mw, mh); --
