rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=a55f862d4e52367a93b141c60e569f6fc523bc38
commit a55f862d4e52367a93b141c60e569f6fc523bc38 Author: Vitalii Vorobiov <[email protected]> Date: Fri Aug 26 18:24:06 2016 +0300 groupedit_view: apply ZOOM FACTOR to image edje part geometry etc @fix --- src/bin/ui/workspace/groupview_calc.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/bin/ui/workspace/groupview_calc.c b/src/bin/ui/workspace/groupview_calc.c index 07ed192..9afde1a 100644 --- a/src/bin/ui/workspace/groupview_calc.c +++ b/src/bin/ui/workspace/groupview_calc.c @@ -45,7 +45,7 @@ static void _common_param_update(Groupview_Part *gp, Evas_Object *edit_obj); static void -_image_param_update(Groupview_Part *gp, Evas_Object *edit_obj); +_image_param_update(Groupview_Part *gp, Groupview_Smart_Data *sd); static void _proxy_param_update(Groupview_Part *gp, Evas_Object *edit_obj); @@ -569,7 +569,7 @@ _part_update(Groupview_Smart_Data *sd, Groupview_Part *gp) _common_param_update(gp, sd->group->edit_object); break; case EDJE_PART_TYPE_IMAGE: - _image_param_update(gp, sd->group->edit_object); + _image_param_update(gp, sd); break; case EDJE_PART_TYPE_PROXY: _proxy_param_update(gp, sd->group->edit_object); @@ -810,9 +810,10 @@ _image_proxy_common_param_update(Evas_Object *image, Groupview_Part *gp, Evas_Ob } static void -_image_param_update(Groupview_Part *gp, Evas_Object *edit_obj) +_image_param_update(Groupview_Part *gp, Groupview_Smart_Data *sd) { Evas_Load_Error err; + Evas_Object *edit_obj = sd->group->edit_object; const char *image_normal; const char *buf = NULL; int id; @@ -893,8 +894,8 @@ _image_param_update(Groupview_Part *gp, Evas_Object *edit_obj) evas_object_geometry_get(edit_obj, &xe, &ye, NULL, NULL); - center_x = xe + rx + (rw / 2); - center_y = ye + ry + (rh / 2); + center_x = xe + rx * sd->zoom + (rw * sd->zoom / 2); + center_y = ye + ry * sd->zoom + (rh * sd->zoom / 2); center_z = 0; m = evas_map_new(4); @@ -936,8 +937,8 @@ _image_param_update(Groupview_Part *gp, Evas_Object *edit_obj) zplane = edje_edit_state_map_perspective_zplane_get(edit_obj, perpective, state, value); focal = edje_edit_state_map_perspective_focal_get(edit_obj, perpective, state, value); - persp_x = xe + rx + (rw / 2); - persp_y = ye + ry + (rh / 2); + persp_x = xe + rx * sd->zoom + (rw * sd->zoom / 2); + persp_y = ye + ry * sd->zoom + (rh * sd->zoom / 2); } else { @@ -955,8 +956,8 @@ _image_param_update(Groupview_Part *gp, Evas_Object *edit_obj) edje_edit_state_color_get(edit_obj, light, state, value, &lr, &lg, &lb, NULL); /* outline because color2 being used in edje_calc */ edje_edit_state_outline_color_get(edit_obj, light, state, value, &lar, &lag, &lab, NULL); - lx = xe + rx + (rw / 2); - ly = ye + ry + (rh / 2); + lx = xe + rx * sd->zoom + (rw * sd->zoom / 2); + ly = ye + ry * sd->zoom + (rh * sd->zoom / 2); lz = edje_edit_state_map_perspective_zplane_get(edit_obj, perpective, state, value); evas_map_util_3d_lighting(m, lx, ly, lz, lr, lg, lb, lar, lag, lab); } --
