[EGIT] [core/enlightenment] master 08/34: deduplicate zone move/resize code

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=519cf154fa3942b8b172b776ffb4df3690e6b646

commit 519cf154fa3942b8b172b776ffb4df3690e6b646
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Fri Aug 4 16:23:38 2017 -0400

    deduplicate zone move/resize code
---
 src/bin/e_zone.c | 43 ++-----------------------------------------
 1 file changed, 2 insertions(+), 41 deletions(-)

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 260cf5dbd..6ed287255 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -294,29 +294,9 @@ e_zone_move(E_Zone *zone,
             int x,
             int y)
 {
-   E_Event_Zone_Move_Resize *ev;
-   int dx, dy;
-
    E_OBJECT_CHECK(zone);
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
-
-   if ((x == zone->x) && (y == zone->y)) return;
-   dx = x - zone->x;
-   dy = y - zone->y;
-   zone->x = x;
-   zone->y = y;
-   evas_object_move(zone->bg_object, x, y);
-   evas_object_move(zone->bg_event_object, x, y);
-   evas_object_move(zone->bg_clip_object, x, y);
-
-   ev = E_NEW(E_Event_Zone_Move_Resize, 1);
-   ev->zone = zone;
-   e_object_ref(E_OBJECT(ev->zone));
-   ecore_event_add(E_EVENT_ZONE_MOVE_RESIZE, ev, _e_zone_event_generic_free, 
NULL);
-
-   _e_zone_edge_move_resize(zone);
-   e_zone_bg_reconfigure(zone);
-   e_zone_reconfigure_clients(zone, dx, dy);
+   e_zone_move_resize(zone, x, y, zone->w, zone->h);
 }
 
 E_API void
@@ -324,28 +304,9 @@ e_zone_resize(E_Zone *zone,
               int w,
               int h)
 {
-   E_Event_Zone_Move_Resize *ev;
-
    E_OBJECT_CHECK(zone);
    E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
-
-   if ((w == zone->w) && (h == zone->h)) return;
-
-   zone->w = w;
-   zone->h = h;
-   evas_object_resize(zone->bg_object, w, h);
-   evas_object_resize(zone->bg_event_object, w, h);
-   evas_object_resize(zone->bg_clip_object, w, h);
-
-   ev = E_NEW(E_Event_Zone_Move_Resize, 1);
-   ev->zone = zone;
-   e_object_ref(E_OBJECT(ev->zone));
-   ecore_event_add(E_EVENT_ZONE_MOVE_RESIZE, ev,
-                   _e_zone_event_generic_free, NULL);
-
-   _e_zone_edge_move_resize(zone);
-   e_zone_bg_reconfigure(zone);
-   e_zone_reconfigure_clients(zone, 0, 0);
+   e_zone_move_resize(zone, zone->x, zone->y, w, h);
 }
 
 E_API Eina_Bool

--