e_comp_wl: remove "maximize_pre" smart call

move the implementation to e_desk_area

Change-Id: Ieb8e411521c0efb2d34e55faa00aba4ac27d34f9

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 0a8f94e5441761d5ec48b079b03b7ef22dc9b9bb..fdf0cc72dd5c2cc150d9990ce7e27c769f310dbf 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2207,14 +2207,6 @@ _e_comp_wl_evas_cb_focus_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *ob
    e_input_thread_safe_call(_e_comp_wl_input_thread_focus_out, (void *)&surface, sizeof(struct wl_resource *));
 }
 
-static void
-_e_comp_wl_evas_cb_maximize_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_maximize_done(void *data, Evas_Object *obj EINA_UNUSED, void *event EINA_UNUSED)
 {
@@ -2411,7 +2403,6 @@ _e_comp_wl_client_evas_init(E_Client *ec)
 
    if (!ec->override)
      {
-        evas_object_smart_callback_add(ec->frame, "maximize_pre",    _e_comp_wl_evas_cb_maximize_pre,    ec);
         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);
@@ -2456,7 +2447,6 @@ _e_comp_wl_client_evas_deinit(E_Client *ec)
 
    if (!ec->override)
      {
-        evas_object_smart_callback_del(ec->frame, "maximize_pre",    _e_comp_wl_evas_cb_maximize_pre);
         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);

diff --git a/src/bin/e_desk_area.c b/src/bin/e_desk_area.c
index 2e8e3755f3bfb7adc4adca7a2592aaeaea0c31c6..f8214afa221987d66295e82864bd332ebf2eccc6 100644 (file)
--- a/src/bin/e_desk_area.c
+++ b/src/bin/e_desk_area.c
@@ -1644,13 +1644,16 @@ _desk_area_cb_client_maximize(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;
+
    max = *((E_Maximize *)data);
 
    ec->pre_res_change.valid = 0;
 
    if (!ec->fullscreen)
      {
-        evas_object_smart_callback_call(ec->frame, "maximize_pre", NULL);
+        ec->comp_data->maximize_pre = 1;
 
         if (!(ec->maximized & E_MAXIMIZE_HORIZONTAL))
           {

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 283e5f50738f0d1e2b62fde5f9a15c18d1172d7d..fa72a535e10ed8ec44deb49f20920b6aabafca54 100644 (file)
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -872,6 +872,9 @@ _zone_cb_client_maximize(struct wl_listener *listener, void *data)
    zone = zone_client->zone;
    ec = zone_client->ec;
 
+   // "override = 1" means that ec is not controlled by wm policy
+   if (ec->override) return;
+
    max = *((E_Maximize *)data);
 
    desk = e_zone_desk_find_by_ec(zone, ec);
@@ -892,7 +895,7 @@ _zone_cb_client_maximize(struct wl_listener *listener, void *data)
 
    if (!ec->fullscreen)
      {
-        evas_object_smart_callback_call(ec->frame, "maximize_pre", NULL);
+        ec->comp_data->maximize_pre = 1;
 
         if (!(ec->maximized & E_MAXIMIZE_HORIZONTAL))
           {