e_view_client: remove e_view_client_frame_geometry_set

e_view_client_frame_geometry_set and e_comp_object_frame_geometry_set are useless.

Change-Id: Id6ca052cad01657b1b5244d81140e92f3a62acf7

diff --git a/src/bin/compmgr/e_comp_object.c b/src/bin/compmgr/e_comp_object.c
index 8db6212716c320f4e268050a871ebe032be64203..2eda4f762380ba3e1db16e15be7db7f8a3c3a436 100644 (file)
--- a/src/bin/compmgr/e_comp_object.c
+++ b/src/bin/compmgr/e_comp_object.c
@@ -3071,47 +3071,6 @@ e_comp_object_frame_geometry_get(Evas_Object *obj, int *l, int *r, int *t, int *
    if (b) *b = cw->client_inset.b;
 }
 
-/* set geometry for CSD */
-EINTERN void
-e_comp_object_frame_geometry_set(Evas_Object *obj, int l, int r, int t, int b)
-{
-   Eina_Bool calc;
-   int tx, ty, tw, th;
-
-   API_ENTRY;
-   if ((cw->client_inset.l == l) && (cw->client_inset.r == r) &&
-       (cw->client_inset.t == t) && (cw->client_inset.b == b)) return;
-   calc = cw->client_inset.calc;
-   cw->client_inset.calc = l || r || t || b;
-   eina_stringshare_replace(&cw->frame_theme, "borderless");
-   if (cw->client_inset.calc)
-     {
-        tw = cw->ec->w + ((l + r) - (cw->client_inset.l + cw->client_inset.r));
-        th = cw->ec->h + ((t + b) - (cw->client_inset.t + cw->client_inset.b));
-        e_client_size_set(cw->ec, tw, th);
-     }
-   else if (cw->ec->maximized || cw->ec->fullscreen)
-     {
-        cw->ec->saved.w -= ((l + r) - (cw->client_inset.l + cw->client_inset.r));
-        cw->ec->saved.h -= ((t + b) - (cw->client_inset.t + cw->client_inset.b));
-     }
-   if (!cw->ec->new_client)
-     {
-        if (calc && cw->client_inset.calc)
-          {
-             tx = cw->ec->x - (l - cw->client_inset.l);
-             ty = cw->ec->y - (t - cw->client_inset.t);
-             e_client_pos_set(cw->ec, tx, ty);
-          }
-        cw->ec->changes.pos = cw->ec->changes.size = 1;
-        EC_CHANGED(cw->ec);
-     }
-   cw->client_inset.l = l;
-   cw->client_inset.r = r;
-   cw->client_inset.t = t;
-   cw->client_inset.b = b;
-}
-
 EINTERN Eina_Bool
 e_comp_object_frame_allowed(Evas_Object *obj)
 {

diff --git a/src/bin/compmgr/e_comp_object_intern.h b/src/bin/compmgr/e_comp_object_intern.h
index 3e567346fc8a8fe81359e4bba6f47034415a3b6c..95ccace626108394b26e3d0213bdf93abd6adb53 100644 (file)
--- a/src/bin/compmgr/e_comp_object_intern.h
+++ b/src/bin/compmgr/e_comp_object_intern.h
@@ -194,7 +194,6 @@ EINTERN void         e_comp_object_damage_trace_debug(Eina_Bool onoff);
 
 EINTERN Eina_Bool e_comp_object_frame_allowed(Evas_Object *obj);
 EINTERN void      e_comp_object_frame_geometry_get(Evas_Object *obj, int *l, int *r, int *t, int *b);
-EINTERN void      e_comp_object_frame_geometry_set(Evas_Object *obj, int l, int r, int t, int b);
 EINTERN Eina_Bool e_comp_object_frame_exists(Evas_Object *obj);
 EINTERN Eina_Bool e_comp_object_frame_theme_set(Evas_Object *obj, const char *name);
 EINTERN void      e_comp_object_frame_extends_get(Evas_Object *obj, int *x, int *y, int *w, int *h);

diff --git a/src/bin/core/e_view_client.c b/src/bin/core/e_view_client.c
index 40ba3b701f06ddde7f89d93ab505626cfaf67c67..f9c5a6570688a265f6c6ba5c93dacca07a83e97a 100644 (file)
--- a/src/bin/core/e_view_client.c
+++ b/src/bin/core/e_view_client.c
@@ -595,14 +595,6 @@ e_view_client_frame_geometry_get(E_View_Client *client, int *l, int *r, int *t,
    e_comp_object_frame_geometry_get(client->view.eo, l, r, t, b);
 }
 
-EINTERN void
-e_view_client_frame_geometry_set(E_View_Client *client, int l, int r, int t, int b)
-{
-   if (client == NULL) return;
-
-   e_comp_object_frame_geometry_set(client->view.eo, l, r, t, b);
-}
-
 EINTERN bool
 e_view_client_frame_exists(E_View_Client *client)
 {

diff --git a/src/bin/core/e_view_client_intern.h b/src/bin/core/e_view_client_intern.h
index 733820c50fdbfd223c9052558bfe29ceba8ec009..72f0f165e5d893b82ceedf65d44c9e414fca3229 100644 (file)
--- a/src/bin/core/e_view_client_intern.h
+++ b/src/bin/core/e_view_client_intern.h
@@ -28,7 +28,6 @@ E_View_Render_Op e_view_client_render_op_get(E_View_Client *client);
 void e_view_client_render_op_set(E_View_Client *client, E_View_Render_Op op);
 bool e_view_client_frame_allowed(E_View_Client *client);
 void e_view_client_frame_geometry_get(E_View_Client *client, int *l, int *r, int *t, int *b);
-void e_view_client_frame_geometry_set(E_View_Client *client, int l, int r, int t, int b);
 bool e_view_client_frame_exists(E_View_Client *client);
 bool e_view_client_frame_theme_set(E_View_Client *client, const char *name);
 bool e_view_client_image_filter_set(E_View_Client *client, E_Comp_Image_Filter filter);

diff --git a/src/bin/server/e_comp_wl.c b/src/bin/server/e_comp_wl.c
index dabc9d8453b3df18d902ca954506836d137d327f..8d242b75577c8d655cb344d5a21d6380f37eb810 100644 (file)
--- a/src/bin/server/e_comp_wl.c
+++ b/src/bin/server/e_comp_wl.c
@@ -2538,7 +2538,6 @@ static void
 _e_comp_wl_surface_state_size_update(E_Client *ec, E_Comp_Wl_Surface_State *state)
 {
    int prev_w, prev_h;
-   Eina_Rectangle *window;
 
    prev_w = state->bw;
    prev_h = state->bh;
@@ -2559,21 +2558,6 @@ _e_comp_wl_surface_state_size_update(E_Client *ec, E_Comp_Wl_Surface_State *stat
              EC_CHANGED(ec);
           }
      }
-
-   if (e_view_client_frame_exists(e_client_view_get(ec))) return;
-   window = &ec->comp_data->shell.window;
-   if ((!ec->borderless) && /* FIXME temporarily added this check code
-                             * to prevent updating E_Client's size by frame */
-       (window->x || window->y || window->w || window->h))
-     {
-        e_view_client_frame_geometry_set(e_client_view_get(ec),
-                                         -window->x,
-                                         (window->x + window->w) - state->bw,
-                                         -window->y,
-                                         (window->y + window->h) - state->bh);
-     }
-   else
-     e_view_client_frame_geometry_set(e_client_view_get(ec), 0, 0, 0, 0);
 }
 
 static void