e_comp_wl: remove "unmaximize_done" smart call

move the implementation to e_desk_area

Change-Id: I1cc5656cdb22edc25f876140b420a51a8f4a6e93

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 3b8d16b..065efdf 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -4519,8 +4519,6 @@ e_client_unmaximize(E_Client *ec, E_Maximize max)
      {
         // call the unmaximize hook of a client
         wl_signal_emit(&PRI(ec)->events.unmaximize, &max);
-
-        evas_object_smart_callback_call(ec->frame, "unmaximize_done", NULL);
      }
 
    ec->maximized = E_MAXIMIZE_NONE;

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index da89814..2f413ca 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2208,21 +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_unmaximize_done(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
-{
-   E_Client *ec = data;
-
-   if (e_object_is_del(E_OBJECT(ec))) return;
-
-   /* check for wayland pixmap */
-
-   if (ec->comp_data->shell.configure_send)
-     _e_comp_wl_configure_send(ec, 0, 0);
-
-   ec->comp_data->maximize_pre = 0;
-}
-
-static void
 _e_comp_wl_evas_cb_fullscreen(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
 {
    E_Client *ec = data;
@@ -2381,7 +2366,6 @@ _e_comp_wl_client_evas_init(E_Client *ec)
 
    if (!ec->override)
      {
-        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);
         evas_object_smart_callback_add(ec->frame, "unfullscreen",    _e_comp_wl_evas_cb_unfullscreen,    ec);
      }
@@ -2423,7 +2407,6 @@ _e_comp_wl_client_evas_deinit(E_Client *ec)
 
    if (!ec->override)
      {
-        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);
         evas_object_smart_callback_del(ec->frame, "unfullscreen",    _e_comp_wl_evas_cb_unfullscreen);
      }

diff --git a/src/bin/e_desk_area.c b/src/bin/e_desk_area.c
index b01c123..f3b18da 100644 (file)
--- a/src/bin/e_desk_area.c
+++ b/src/bin/e_desk_area.c
@@ -1790,6 +1790,11 @@ _desk_area_cb_client_unmaximize(struct wl_listener *listener, void *data)
              if (horiz)
                ec->saved.w = ec->saved.x = 0;
           }
+
+        if (ec->comp_data->shell.configure_send)
+          _e_desk_area_configure_send(ec, 0, 0);
+
+        ec->comp_data->maximize_pre = 0;
      }
 }