forked from enlightenment/enlightenment
Revert "add E_Client->saved.frame to handle mismatched csd states"
This reverts commit ae7af6b8ef
.
this was a workaround for an entirely different issue, and it didn't even
solve that issue
This commit is contained in:
parent
992e04feb2
commit
e9bca1abaa
|
@ -3796,7 +3796,6 @@ e_client_maximize(E_Client *ec, E_Maximize max)
|
|||
}
|
||||
|
||||
ec->saved.zone = ec->zone->num;
|
||||
ec->saved.frame = e_comp_object_frame_exists(ec->frame) || (!e_comp_object_frame_allowed(ec->frame));
|
||||
|
||||
_e_client_maximize(ec, max);
|
||||
|
||||
|
@ -3912,19 +3911,13 @@ e_client_unmaximize(E_Client *ec, E_Maximize max)
|
|||
ec->maximize_override = 1;
|
||||
evas_object_smart_callback_call(ec->frame, "unmaximize", NULL);
|
||||
e_client_resize_limit(ec, &w, &h);
|
||||
if (ec->saved.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_wh_adjust(ec->frame, w, h, &w, &h);
|
||||
}
|
||||
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_client_maximize_run(ec, x, y, w, h);
|
||||
if (vert)
|
||||
ec->saved.h = ec->saved.y = 0;
|
||||
if (horiz)
|
||||
ec->saved.w = ec->saved.x = 0;
|
||||
if (vert && horiz)
|
||||
ec->saved.frame = 0;
|
||||
}
|
||||
e_hints_window_maximized_set(ec, ec->maximized & E_MAXIMIZE_HORIZONTAL,
|
||||
ec->maximized & E_MAXIMIZE_VERTICAL);
|
||||
|
@ -3968,7 +3961,6 @@ e_client_fullscreen(E_Client *ec, E_Fullscreen policy)
|
|||
ec->saved.y = ec->client.y - ec->zone->y;
|
||||
ec->saved.w = ec->client.w;
|
||||
ec->saved.h = ec->client.h;
|
||||
ec->saved.frame = e_comp_object_frame_exists(ec->frame) || (!e_comp_object_frame_allowed(ec->frame));
|
||||
}
|
||||
ec->saved.maximized = ec->maximized;
|
||||
ec->saved.zone = ec->zone->num;
|
||||
|
@ -3980,7 +3972,6 @@ e_client_fullscreen(E_Client *ec, E_Fullscreen policy)
|
|||
ec->saved.y = y;
|
||||
ec->saved.w = w;
|
||||
ec->saved.h = h;
|
||||
ec->saved.frame = e_comp_object_frame_exists(ec->frame) || (!e_comp_object_frame_allowed(ec->frame));
|
||||
}
|
||||
|
||||
ec->saved.layer = ec->layer;
|
||||
|
@ -4038,16 +4029,10 @@ e_client_unfullscreen(E_Client *ec)
|
|||
_e_client_frame_update(ec);
|
||||
ec->fullscreen_policy = 0;
|
||||
evas_object_smart_callback_call(ec->frame, "unfullscreen", NULL);
|
||||
if (ec->saved.frame &&
|
||||
(e_comp_object_frame_exists(ec->frame) || (!e_comp_object_frame_allowed(ec->frame))))
|
||||
e_client_util_move_resize_without_frame(ec, ec->zone->x + ec->saved.x,
|
||||
ec->zone->y + ec->saved.y,
|
||||
ec->saved.w, ec->saved.h);
|
||||
else
|
||||
evas_object_geometry_set(ec->frame, ec->zone->x + ec->saved.x,
|
||||
ec->zone->y + ec->saved.y,
|
||||
ec->saved.w, ec->saved.h);
|
||||
ec->saved.frame = 0;
|
||||
e_client_util_move_resize_without_frame(ec, ec->zone->x + ec->saved.x,
|
||||
ec->zone->y + ec->saved.y,
|
||||
ec->saved.w, ec->saved.h);
|
||||
|
||||
if (ec->saved.maximized)
|
||||
e_client_maximize(ec, (e_config->maximize_policy & E_MAXIMIZE_TYPE) |
|
||||
ec->saved.maximized);
|
||||
|
|
|
@ -309,7 +309,6 @@ struct E_Client
|
|||
E_Layer layer;
|
||||
int zone;
|
||||
E_Maximize maximized;
|
||||
Eina_Bool frame : 1;
|
||||
} saved;
|
||||
|
||||
struct
|
||||
|
|
Loading…
Reference in New Issue