From b2107ae2b00c4907b991be9eda439eded46cc40e Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Sat, 12 Mar 2016 11:18:10 -0500 Subject: [PATCH] remove maximize_pre flag from wl client comp_data this breaks modification of maximized size for surfaces as well as animations fix T3297 partially reverts 0321fd690e6c231d14843785a0308e4e51e2c1e6 --- src/bin/e_comp_wl.c | 16 +--------------- src/bin/e_comp_wl.h | 1 - 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 7098b4381..0015fb51f 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -653,8 +653,7 @@ _e_comp_wl_evas_cb_resize(void *data, Evas_Object *obj EINA_UNUSED, void *event e_comp_wl->resize.edges, x, y); } - else if ((!ec->fullscreen) && (!ec->maximized) && - (!ec->comp_data->maximize_pre)) + else _e_comp_wl_configure_send(ec, 1); } @@ -669,15 +668,6 @@ _e_comp_wl_evas_cb_state_update(void *data, Evas_Object *obj EINA_UNUSED, void * if (ec->comp_data->shell.configure_send) _e_comp_wl_configure_send(ec, 0); - ec->comp_data->maximize_pre = 0; -} - -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 @@ -806,10 +796,6 @@ _e_comp_wl_client_evas_init(E_Client *ec) _e_comp_wl_evas_cb_state_update, ec); evas_object_smart_callback_add(ec->frame, "unmaximize_done", _e_comp_wl_evas_cb_state_update, ec); - evas_object_smart_callback_add(ec->frame, "maximize_pre", - _e_comp_wl_evas_cb_maximize_pre, ec); - evas_object_smart_callback_add(ec->frame, "unmaximize_pre", - _e_comp_wl_evas_cb_maximize_pre, ec); evas_object_smart_callback_add(ec->frame, "fullscreen", _e_comp_wl_evas_cb_state_update, ec); evas_object_smart_callback_add(ec->frame, "unfullscreen", diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h index e7df72ac9..cefe97d2d 100644 --- a/src/bin/e_comp_wl.h +++ b/src/bin/e_comp_wl.h @@ -298,7 +298,6 @@ struct _E_Comp_Wl_Client_Data Eina_Bool evas_init : 1; Eina_Bool set_win_type : 1; Eina_Bool frame_update : 1; - Eina_Bool maximize_pre : 1; Eina_Bool cursor : 1; };