From 63c238b0c15f234727292ec6c2c6dcff9c97628c Mon Sep 17 00:00:00 2001 From: tsauerbeck Date: Fri, 29 Oct 2004 15:12:01 +0000 Subject: [PATCH] Oops SVN revision: 12059 --- legacy/edje/src/lib/Edje_Edit.h | 1 + legacy/edje/src/lib/edje_calc.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/legacy/edje/src/lib/Edje_Edit.h b/legacy/edje/src/lib/Edje_Edit.h index 15859ad1fd..b3f4f88ed0 100644 --- a/legacy/edje/src/lib/Edje_Edit.h +++ b/legacy/edje/src/lib/Edje_Edit.h @@ -691,6 +691,7 @@ struct _Edje_Var }; void _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, double pos); +Edje_Part_Description *_edje_part_description_find(Edje *ed, Edje_Real_Part *rp, char *name, double val); void _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, char *d1, double v1, char *d2, double v2); void _edje_recalc(Edje *ed); int _edje_part_dragable_calc(Edje *ed, Edje_Real_Part *ep, double *x, double *y); diff --git a/legacy/edje/src/lib/edje_calc.c b/legacy/edje/src/lib/edje_calc.c index 1bb53d181a..067fdac172 100644 --- a/legacy/edje/src/lib/edje_calc.c +++ b/legacy/edje/src/lib/edje_calc.c @@ -47,9 +47,10 @@ _edje_part_pos_set(Edje *ed, Edje_Real_Part *ep, int mode, double pos) } Edje_Part_Description * -_edje_part_description_find(Edje *ed, Edje_Part *ep, char *name, +_edje_part_description_find(Edje *ed, Edje_Real_Part *rp, char *name, double val) { + Edje_Part *ep = rp->part; Edje_Part_Description *ret = NULL; Evas_List *l; double min_dst = 999.0; @@ -89,11 +90,11 @@ _edje_part_description_apply(Edje *ed, Edje_Real_Part *ep, char *d1, double v1, if (!d1) d1 = "default"; if (!d2) d2 = "default"; - ep->param1.description = _edje_part_description_find(ed, ep->part, d1, v1); + ep->param1.description = _edje_part_description_find(ed, ep, d1, v1); if (!ep->param1.description) ep->param1.description = ep->part->default_desc; - ep->param2.description = _edje_part_description_find(ed, ep->part, d2, v2); + ep->param2.description = _edje_part_description_find(ed, ep, d2, v2); ep->param1.rel1_to_x = NULL; ep->param1.rel1_to_y = NULL;