[EGIT] [core/enlightenment] master 01/01: optimize zoomap recalc during recursion

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=6b93a73d0c0db0ab7e18237368575da5cf8d43b5

commit 6b93a73d0c0db0ab7e18237368575da5cf8d43b5
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Fri Jan 8 15:46:27 2016 -0500

    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
---
 src/bin/e_zoomap.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_zoomap.c b/src/bin/e_zoomap.c
index 41783dc..f27b665 100644
--- a/src/bin/e_zoomap.c
+++ b/src/bin/e_zoomap.c
@@ -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

--