styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change client un/maximize_pre callback location to occur after safety checks

This commit is contained in:
Mike Blumenkrantz 2016-04-08 12:22:47 -04:00
parent 4cc66119c5
commit 71c1669036
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/e_client.c
View File

@ -3766,7 +3766,7 @@ e_client_maximize(E_Client *ec, E_Maximize max)
if (!(max & E_MAXIMIZE_DIRECTION)) max |= E_MAXIMIZE_BOTH; if (!(max & E_MAXIMIZE_DIRECTION)) max |= E_MAXIMIZE_BOTH;
if ((ec->shaded) || (ec->shading)) return; if ((ec->shaded) || (ec->shading)) return;
evas_object_smart_callback_call(ec->frame, "maximize_pre", NULL);
/* Only allow changes in vertical/ horizontal maximization */ /* Only allow changes in vertical/ horizontal maximization */
if (((ec->maximized & E_MAXIMIZE_DIRECTION) == (max & E_MAXIMIZE_DIRECTION)) || if (((ec->maximized & E_MAXIMIZE_DIRECTION) == (max & E_MAXIMIZE_DIRECTION)) ||
((ec->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)) return; ((ec->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)) return;
@ -3778,7 +3778,7 @@ e_client_maximize(E_Client *ec, E_Maximize max)
EC_CHANGED(ec); EC_CHANGED(ec);
return; return;
} }
evas_object_smart_callback_call(ec->frame, "maximize_pre", NULL);
if (ec->fullscreen) if (ec->fullscreen)
e_client_unfullscreen(ec); e_client_unfullscreen(ec);
ec->pre_res_change.valid = 0; ec->pre_res_change.valid = 0;
@ -3836,9 +3836,10 @@ e_client_unmaximize(E_Client *ec, E_Maximize max)
} }
if ((ec->shaded) || (ec->shading)) return; if ((ec->shaded) || (ec->shading)) return;
evas_object_smart_callback_call(ec->frame, "unmaximize_pre", NULL);
/* Remove directions not used */ /* Remove directions not used */
max &= (ec->maximized & E_MAXIMIZE_DIRECTION); max &= (ec->maximized & E_MAXIMIZE_DIRECTION);
evas_object_smart_callback_call(ec->frame, "unmaximize_pre", NULL);
/* Can only remove existing maximization directions */ /* Can only remove existing maximization directions */
if (!max) return; if (!max) return;
if (ec->maximized & E_MAXIMIZE_TYPE) if (ec->maximized & E_MAXIMIZE_TYPE)