forked from enlightenment/enlightenment
perform frame adjustments before applying wm spec hints during unmaximize
e_client_resize_limit removes frame adjustments before performing calcs, so ensure that the geometry passed is pre-adjusted to account for this
This commit is contained in:
parent
804bf20c72
commit
171aebbff1
|
@ -3968,13 +3968,13 @@ e_client_unmaximize(E_Client *ec, E_Maximize max)
|
||||||
ec->maximize_override = 1;
|
ec->maximize_override = 1;
|
||||||
if (!fullscreen)
|
if (!fullscreen)
|
||||||
evas_object_smart_callback_call(ec->frame, "unmaximize", NULL);
|
evas_object_smart_callback_call(ec->frame, "unmaximize", NULL);
|
||||||
e_client_resize_limit(ec, &w, &h);
|
|
||||||
if (ec->saved.frame &&
|
if (ec->saved.frame &&
|
||||||
(e_comp_object_frame_exists(ec->frame) || (!e_comp_object_frame_allowed(ec->frame))))
|
(e_comp_object_frame_exists(ec->frame) || (!e_comp_object_frame_allowed(ec->frame))))
|
||||||
{
|
{
|
||||||
e_comp_object_frame_xy_adjust(ec->frame, x, y, &x, &y);
|
e_comp_object_frame_xy_adjust(ec->frame, x, y, &x, &y);
|
||||||
e_comp_object_frame_wh_adjust(ec->frame, w, h, &w, &h);
|
e_comp_object_frame_wh_adjust(ec->frame, w, h, &w, &h);
|
||||||
}
|
}
|
||||||
|
e_client_resize_limit(ec, &w, &h);
|
||||||
if (fullscreen)
|
if (fullscreen)
|
||||||
evas_object_smart_callback_call(ec->frame, "unmaximize", NULL);
|
evas_object_smart_callback_call(ec->frame, "unmaximize", NULL);
|
||||||
if (!_e_client_maximize_run(ec, x, y, w, h))
|
if (!_e_client_maximize_run(ec, x, y, w, h))
|
||||||
|
|
Loading…
Reference in New Issue