forked from enlightenment/enlightenment
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 0321fd690e
This commit is contained in:
parent
3413399b15
commit
b2107ae2b0
|
@ -653,8 +653,7 @@ _e_comp_wl_evas_cb_resize(void *data, Evas_Object *obj EINA_UNUSED, void *event
|
||||||
e_comp_wl->resize.edges,
|
e_comp_wl->resize.edges,
|
||||||
x, y);
|
x, y);
|
||||||
}
|
}
|
||||||
else if ((!ec->fullscreen) && (!ec->maximized) &&
|
else
|
||||||
(!ec->comp_data->maximize_pre))
|
|
||||||
_e_comp_wl_configure_send(ec, 1);
|
_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)
|
if (ec->comp_data->shell.configure_send)
|
||||||
_e_comp_wl_configure_send(ec, 0);
|
_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
|
static void
|
||||||
|
@ -806,10 +796,6 @@ _e_comp_wl_client_evas_init(E_Client *ec)
|
||||||
_e_comp_wl_evas_cb_state_update, ec);
|
_e_comp_wl_evas_cb_state_update, ec);
|
||||||
evas_object_smart_callback_add(ec->frame, "unmaximize_done",
|
evas_object_smart_callback_add(ec->frame, "unmaximize_done",
|
||||||
_e_comp_wl_evas_cb_state_update, ec);
|
_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",
|
evas_object_smart_callback_add(ec->frame, "fullscreen",
|
||||||
_e_comp_wl_evas_cb_state_update, ec);
|
_e_comp_wl_evas_cb_state_update, ec);
|
||||||
evas_object_smart_callback_add(ec->frame, "unfullscreen",
|
evas_object_smart_callback_add(ec->frame, "unfullscreen",
|
||||||
|
|
|
@ -298,7 +298,6 @@ struct _E_Comp_Wl_Client_Data
|
||||||
Eina_Bool evas_init : 1;
|
Eina_Bool evas_init : 1;
|
||||||
Eina_Bool set_win_type : 1;
|
Eina_Bool set_win_type : 1;
|
||||||
Eina_Bool frame_update : 1;
|
Eina_Bool frame_update : 1;
|
||||||
Eina_Bool maximize_pre : 1;
|
|
||||||
Eina_Bool cursor : 1;
|
Eina_Bool cursor : 1;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue