enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

fix internal window border changing

This commit is contained in:
Mike Blumenkrantz 2014-11-03 14:07:54 -05:00
parent 96ef647cc0
commit a9495340f6
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/e_client.c
View File

@ -2303,7 +2303,7 @@ e_client_idler_before(void)
if (!_e_client_hook_call(E_CLIENT_HOOK_EVAL_POST_FETCH, ec)) continue;
if (!_e_client_hook_call(E_CLIENT_HOOK_EVAL_PRE_FRAME_ASSIGN, ec)) continue;
if ((ec->border.changed) && (!ec->shaded) && (!ec->override) &&
if ((ec->border.changed) && (!ec->shaded) && ((!ec->override) || ec->internal) &&
(!(((ec->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN))))
_e_client_frame_update(ec);
ec->border.changed = 0;

11
src/bin/e_comp_x.c
View File

@ -2990,8 +2990,9 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
}
if (ec->changes.prop || ec->netwm.fetch.type)
{
unsigned int type = ec->netwm.type;
e_hints_window_type_get(ec);
if (((!ec->lock_border) || (!ec->border.name)) && ec->comp_data->reparented)
if (((!ec->lock_border) || (!ec->border.name) || (type != ec->netwm.type)) && (ec->comp_data->reparented || ec->internal))
{
ec->border.changed = 1;
EC_CHANGED(ec);
@ -3717,7 +3718,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
}
if (ec->mwm.borderless != pb)
{
if (ec->comp_data->reparented && ((!ec->lock_border) || (!ec->border.name)))
if ((ec->internal || ec->comp_data->reparented) && ((!ec->lock_border) || (!ec->border.name)))
{
ec->border.changed = 1;
EC_CHANGED(ec);
@ -3782,7 +3783,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
/* Some stats might change the border, like modal */
if (((!ec->lock_border) || (!ec->border.name)) &&
(!(((ec->maximized & E_MAXIMIZE_TYPE) == E_MAXIMIZE_FULLSCREEN))) &&
ec->comp_data->reparented)
(ec->internal || ec->comp_data->reparented))
{
ec->border.changed = 1;
EC_CHANGED(ec);
@ -3824,7 +3825,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
E_Exec_Instance *inst;
if (((!ec->lock_border) || (!ec->border.name)) &&
(ec->comp_data->reparented))
(ec->internal || ec->comp_data->reparented))
{
ec->border.changed = 1;
EC_CHANGED(ec);
@ -4013,7 +4014,7 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec)
}
ec->changes.prop = 0;
if (rem_change) e_remember_update(ec);
if (!ec->comp_data->reparented) ec->changes.border = 0;
if ((!ec->comp_data->reparented) && (!ec->internal)) ec->changes.border = 0;
if (ec->changes.icon)
{
/* don't create an icon until we need it */