e_comp_wl: remove "unmaximize_pre" smart call

move the implementation to e_desk_area

Change-Id: Ia494a2c970efa300528f2af935ef29c34501d110

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index d763b71..3b8d16b 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -4517,8 +4517,6 @@ e_client_unmaximize(E_Client *ec, E_Maximize max)
 
    if (!ec->fullscreen)
      {
-        evas_object_smart_callback_call(ec->frame, "unmaximize_pre", NULL);
-
         // call the unmaximize hook of a client
         wl_signal_emit(&PRI(ec)->events.unmaximize, &max);
 

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 5902408..da89814 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2208,14 +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_pre(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
-{
-   E_Client *ec = data;
-
-   ec->comp_data->maximize_pre = 1;
-}
-
-static void
 _e_comp_wl_evas_cb_unmaximize_done(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
 {
    E_Client *ec = data;
@@ -2389,7 +2381,6 @@ _e_comp_wl_client_evas_init(E_Client *ec)
 
    if (!ec->override)
      {
-        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);
         evas_object_smart_callback_add(ec->frame, "unfullscreen",    _e_comp_wl_evas_cb_unfullscreen,    ec);
@@ -2432,7 +2423,6 @@ _e_comp_wl_client_evas_deinit(E_Client *ec)
 
    if (!ec->override)
      {
-        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);
         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 fa4d16d..b01c123 100644 (file)
--- a/src/bin/e_desk_area.c
+++ b/src/bin/e_desk_area.c
@@ -1690,12 +1690,16 @@ _desk_area_cb_client_unmaximize(struct wl_listener *listener, void *data)
    eda = eda_client->eda;
    ec = eda_client->ec;
 
+   // "override = 1" means that ec is not controlled by wm policy
+   if (ec->override) return;
    if (ec->fullscreen) return;
 
    max = *((E_Maximize *)data);
 
    if (ec->maximized & E_MAXIMIZE_TYPE)
      {
+        ec->comp_data->maximize_pre = 1;
+
         ec->pre_res_change.valid = 0;
         ec->changes.need_maximize = 0;