enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

optimize zoomap recalc during recursion 

in most cases, zoomap recalcs will trigger recursive calls to zoomap
recalc. these inner calls can be optimized to just do the object move,
allowing the outer-most call to perform the remainder of the recalc
operation
This commit is contained in:
Mike Blumenkrantz 2016-01-08 15:46:27 -05:00
parent 79616d66dd
commit 6b93a73d0c
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/e_zoomap.c
View File

@ -10,6 +10,7 @@ struct _E_Smart_Data
Evas_Object *smart_obj, *child_obj;
Evas_Coord x, y, w, h;
Evas_Coord child_w, child_h;
unsigned int recurse;
Eina_Bool solid : 1;
Eina_Bool smooth : 1;
Eina_Bool always : 1;
@ -190,6 +191,7 @@ static void
_e_zoomap_smart_reconfigure(E_Smart_Data *sd)
{
if (!sd->child_obj) return;
sd->recurse++;
if ((!sd->always) &&
((sd->w == sd->child_w) && (sd->h == sd->child_h)))
{
@ -206,7 +208,13 @@ _e_zoomap_smart_reconfigure(E_Smart_Data *sd)
int r = 0, g = 0, b = 0, a = 0;
evas_object_geometry_get(sd->child_obj, &cx, &cy, NULL, NULL);
evas_object_color_get(sd->child_obj, &r, &g, &b, &a);
if (sd->recurse != 1)
{
/* recursion: do move and exit to set map in outer call */
evas_object_move(sd->child_obj, sd->x, sd->y);
sd->recurse--;
return;
}
if ((cx != sd->x) || (cy != sd->y))
{
evas_smart_objects_calculate(e);
@ -215,6 +223,7 @@ _e_zoomap_smart_reconfigure(E_Smart_Data *sd)
evas_smart_objects_calculate(e);
evas_nochange_pop(e);
}
evas_object_color_get(sd->child_obj, &r, &g, &b, &a);
m = evas_map_new(4);
evas_map_util_points_populate_from_geometry(m, sd->x, sd->y,
sd->w, sd->h, 0);
@ -233,6 +242,7 @@ _e_zoomap_smart_reconfigure(E_Smart_Data *sd)
evas_object_map_enable_set(sd->child_obj, EINA_TRUE);
evas_map_free(m);
}
sd->recurse--;
}
static void