e_comp_object: add missing function

This fix the build break

Change-Id: Ibd347bce38c71f2a17ebb95a83b905f861ce1df9

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 856cc9f..0b3d923 100644 (file)
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -2827,9 +2827,11 @@ _e_comp_intercept_color_set(void *data, Evas_Object *obj, int r, int g, int b, i
 
 ////////////////////////////////////////////////////
 
-static void
-_e_comp_object_frame_recalc(E_Comp_Object *cw)
+EINTERN void
+e_comp_object_frame_recalc(Evas_Object *obj)
 {
+   API_ENTRY;
+
    cw->client_inset.l = 0;
    cw->client_inset.r = 0;
    cw->client_inset.t = 0;
@@ -2838,70 +2840,27 @@ _e_comp_object_frame_recalc(E_Comp_Object *cw)
    cw->client_inset.calc = 0;
 }
 
-static void
-_e_comp_smart_cb_frame_recalc(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
-{
-   E_Comp_Object *cw = data;
-   E_Zone *zone;
-   int w, h, pw, ph;
-
-   /* - get current size
-    * - calc new size
-    * - readjust for new frame size
-    */
-
-   w = cw->ec->w, h = cw->ec->h;
-   e_comp_object_frame_wh_unadjust(obj, w, h, &pw, &ph);
-
-   _e_comp_object_frame_recalc(cw);
-
-   if (!cw->ec->fullscreen)
-     e_comp_object_frame_wh_adjust(obj, cw->ec->client.w, cw->ec->client.h, &w, &h);
-
-   evas_object_smart_callback_call(cw->smart_obj, "frame_recalc_done", &cw->client_inset);
-   if (cw->ec->fullscreen)
-     {
-        zone = e_comp_zone_find_by_ec(cw->ec);
-        if (!zone) return;
-        evas_object_resize(cw->ec->frame, zone->w, zone->h);
-     }
-   else if (cw->ec->new_client)
-     {
-        if ((cw->ec->w < 1) || (cw->ec->h < 1)) return;
-        e_comp_object_frame_wh_adjust(obj, pw, ph, &w, &h);
-        evas_object_resize(cw->ec->frame, w, h);
-     }
-   else if ((w != cw->ec->w) || (h != cw->ec->h))
-     evas_object_resize(cw->ec->frame, w, h);
-}
-
-static void
-_e_comp_smart_cb_maximize(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+EINTERN void
+e_comp_object_maximize(Evas_Object *obj)
 {
-   E_Comp_Object *cw = data;
+   API_ENTRY;
 
    _e_comp_object_shadow_setup(cw);
 }
 
-static void
-_e_comp_smart_cb_fullscreen(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+EINTERN void
+e_comp_object_fullscreen(Evas_Object *obj)
 {
-   E_Comp_Object *cw = data;
+   API_ENTRY;
 
    if (_e_comp_object_shadow_setup(cw))
      e_comp_object_damage(cw->smart_obj, 0, 0, cw->ec->w, cw->ec->h);
 }
 
-static void
-_e_comp_smart_cb_unmaximize(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
-{
-
-}
-
-static void
-_e_comp_smart_cb_unfullscreen(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
+EINTERN void
+e_comp_object_unfullscreen(Evas_Object *obj)
 {
-   E_Comp_Object *cw = data;
+   API_ENTRY;
 
    if (_e_comp_object_shadow_setup(cw))
      {
@@ -3126,13 +3085,6 @@ _e_comp_smart_add(Evas_Object *obj)
    evas_object_intercept_focus_set_callback_add(obj, _e_comp_intercept_focus, cw);
    evas_object_intercept_color_set_callback_add(obj, _e_comp_intercept_color_set, cw);
 
-   evas_object_smart_callback_add(obj, "maximize", _e_comp_smart_cb_maximize, cw);
-   evas_object_smart_callback_add(obj, "fullscreen", _e_comp_smart_cb_fullscreen, cw);
-   evas_object_smart_callback_add(obj, "unmaximize", _e_comp_smart_cb_unmaximize, cw);
-   evas_object_smart_callback_add(obj, "unfullscreen", _e_comp_smart_cb_unfullscreen, cw);
-
-   evas_object_smart_callback_add(obj, "frame_recalc", _e_comp_smart_cb_frame_recalc, cw);
-
    evas_object_event_callback_add(obj, EVAS_CALLBACK_FOCUS_IN, _e_comp_smart_focus_in, cw);
    evas_object_event_callback_add(obj, EVAS_CALLBACK_FOCUS_OUT, _e_comp_smart_focus_out, cw);
 }
@@ -4155,14 +4107,10 @@ E_API void
 e_comp_object_damage(Evas_Object *obj, int x, int y, int w, int h)
 {
    int tw, th;
-   Eina_Rectangle rect;
    API_ENTRY;
 
    if (cw->ec->input_only || (!cw->updates)) return;
    if (cw->nocomp) return;
-   rect.x = x, rect.y = y;
-   rect.w = w, rect.h = h;
-   evas_object_smart_callback_call(obj, "damage", &rect);
 
    if (e_comp_is_on_overlay(cw->ec))
      {
@@ -4469,13 +4417,11 @@ e_comp_object_redirected_set(Evas_Object *obj, Eina_Bool set)
           e_comp_object_damage(obj, 0, 0, cw->w, cw->h);
 
         _e_comp_object_transparent_set(obj, EINA_FALSE);
-        evas_object_smart_callback_call(obj, "redirected", NULL);
      }
    else
      {
         _e_comp_object_clear(cw);
         _e_comp_object_transparent_set(obj, EINA_TRUE);
-        evas_object_smart_callback_call(obj, "unredirected", NULL);
      }
 }
 
@@ -4738,7 +4684,6 @@ e_comp_object_dirty(Evas_Object *obj)
         eina_tiler_tile_size_set(cw->updates, 1, 1);
      }
    cw->update_count = cw->updates_full = cw->updates_exist = 0;
-   evas_object_smart_callback_call(obj, "dirty", NULL);
    if (cw->visible || (!visible) || (!cw->pending_updates) || cw->native) return;
    /* force render if main object is hidden but mirrors are visible */
    RENDER_DEBUG("FORCING RENDER %p", cw->ec);

diff --git a/src/bin/e_comp_object_intern.h b/src/bin/e_comp_object_intern.h
index 7e44aa5..59aa583 100644 (file)
--- a/src/bin/e_comp_object_intern.h
+++ b/src/bin/e_comp_object_intern.h
@@ -273,6 +273,12 @@ EINTERN void e_comp_object_stack_below(Evas_Object *obj, Evas_Object *target);
 EINTERN void e_comp_object_transform_obj_stack_update(Evas_Object *obj);
 //#endif
 
+EINTERN void e_comp_object_fullscreen(Evas_Object *obj);
+EINTERN void e_comp_object_unfullscreen(Evas_Object *obj);
+EINTERN void e_comp_object_maximize(Evas_Object *obj);
+
+EINTERN void e_comp_object_frame_recalc(Evas_Object *obj);
+
 // listeners
 EINTERN void e_comp_object_lower_listener_add(Evas_Object *obj, struct wl_listener *listener);
 //#ifdef REFACTOR_DESK_AREA

diff --git a/src/bin/e_desk_area.c b/src/bin/e_desk_area.c
index 91647e9..25328bb 100644 (file)
--- a/src/bin/e_desk_area.c
+++ b/src/bin/e_desk_area.c
@@ -1244,6 +1244,8 @@ _desk_area_cb_client_fullscreen(struct wl_listener *listener, void *data)
    if (!e_client_util_ignored_get(ec))
      e_client_frame_update(ec);
 
+   e_comp_object_fullscreen(ec->frame);
+
    if (ec->comp_data->shell.configure_send)
      _e_desk_area_configure_send(ec, 0, 1);
 
@@ -1270,6 +1272,8 @@ _desk_area_cb_client_unfullscreen(struct wl_listener *listener, void *data)
    if (!e_client_util_ignored_get(ec))
      e_client_frame_update(ec);
 
+   e_comp_object_unfullscreen(ec->frame);
+
    if (ec->comp_data->shell.configure_send)
      _e_desk_area_configure_send(ec, 0, 0);
 
@@ -1625,7 +1629,7 @@ _e_desk_area_ec_maximize(E_Desk_Area *eda, E_Client *ec, E_Maximize max)
               zh = y2 - yy1;
            }
 
-         evas_object_smart_callback_call(ec->frame, "maximize", NULL);
+         e_comp_object_maximize(ec->frame);
 
          switch (max & E_MAXIMIZE_DIRECTION)
            {

diff --git a/src/bin/e_keyrouter_wl.c b/src/bin/e_keyrouter_wl.c
index ad19e36..080ae45 100644 (file)
--- a/src/bin/e_keyrouter_wl.c
+++ b/src/bin/e_keyrouter_wl.c
@@ -4,9 +4,9 @@
 #include "e_comp_wl_intern.h"
 #include "e_client_intern.h"
 #include "e_config_intern.h"
-#include "e_security.h"
 #include "e_comp_input_intern.h"
 #include "e_input_thread_client_intern.h"
+#include "e_security.h"
 
 #include <tizen-extension-server-protocol.h>
 

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 55b2db6..5743433 100644 (file)
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -292,7 +292,7 @@ _e_zone_client_maximize(E_Zone *zone, E_Desk *desk, E_Client *ec, E_Maximize max
               zh = y2 - yy1;
            }
 
-         evas_object_smart_callback_call(ec->frame, "maximize", NULL);
+         e_comp_object_maximize(ec->frame);
 
          switch (max & E_MAXIMIZE_DIRECTION)
            {