e_comp_wl: remove "maximize_done" smart call

move the implementation to e_desk_area

Change-Id: I33cc11fa55646e3363ed7845239827f6445a5684

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 27c1ca6..d763b71 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -4483,8 +4483,6 @@ e_client_maximize(E_Client *ec, E_Maximize max)
         // store the E_Maximize value
         ec->maximized = max;
         ec->changes.need_unmaximize = 0;
-
-        evas_object_smart_callback_call(ec->frame, "maximize_done", NULL);
      }
    else
      {

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index fdf0cc7..5902408 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2208,20 +2208,6 @@ _e_comp_wl_evas_cb_focus_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *ob
 }
 
 static void
-_e_comp_wl_evas_cb_maximize_done(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
-{
-   E_Client *ec = data;
-   int w, h;
-
-   if (e_object_is_del(E_OBJECT(ec))) return;
-
-   e_client_maximized_geometry_get(ec, NULL, NULL, &w, &h);
-   e_client_shell_configure_send(ec, 0, w, h);
-
-   ec->comp_data->maximize_pre = 0;
-}
-
-static void
 _e_comp_wl_evas_cb_unmaximize_pre(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
 {
    E_Client *ec = data;
@@ -2403,7 +2389,6 @@ _e_comp_wl_client_evas_init(E_Client *ec)
 
    if (!ec->override)
      {
-        evas_object_smart_callback_add(ec->frame, "maximize_done",   _e_comp_wl_evas_cb_maximize_done,   ec);
         evas_object_smart_callback_add(ec->frame, "unmaximize_pre",  _e_comp_wl_evas_cb_unmaximize_pre,  ec);
         evas_object_smart_callback_add(ec->frame, "unmaximize_done", _e_comp_wl_evas_cb_unmaximize_done, ec);
         evas_object_smart_callback_add(ec->frame, "fullscreen",      _e_comp_wl_evas_cb_fullscreen,      ec);
@@ -2447,7 +2432,6 @@ _e_comp_wl_client_evas_deinit(E_Client *ec)
 
    if (!ec->override)
      {
-        evas_object_smart_callback_del(ec->frame, "maximize_done",   _e_comp_wl_evas_cb_maximize_done);
         evas_object_smart_callback_del(ec->frame, "unmaximize_pre",  _e_comp_wl_evas_cb_unmaximize_pre);
         evas_object_smart_callback_del(ec->frame, "unmaximize_done", _e_comp_wl_evas_cb_unmaximize_done);
         evas_object_smart_callback_del(ec->frame, "fullscreen",      _e_comp_wl_evas_cb_fullscreen);

diff --git a/src/bin/e_desk_area.c b/src/bin/e_desk_area.c
index f8214af..fa4d16d 100644 (file)
--- a/src/bin/e_desk_area.c
+++ b/src/bin/e_desk_area.c
@@ -1639,6 +1639,7 @@ _desk_area_cb_client_maximize(struct wl_listener *listener, void *data)
    E_Desk_Area *eda;
    E_Client *ec;
    E_Maximize max;
+   int w, h;
 
    eda_client = wl_container_of(listener, eda_client, client_maximize);
    eda = eda_client->eda;
@@ -1669,6 +1670,11 @@ _desk_area_cb_client_maximize(struct wl_listener *listener, void *data)
           }
 
         _e_desk_area_ec_maximize(eda, ec, max);
+
+        e_client_maximized_geometry_get(ec, NULL, NULL, &w, &h);
+        e_client_shell_configure_send(ec, 0, w, h);
+
+        ec->comp_data->maximize_pre = 0;
      }
 }