fix fullscreen window moving using pager/bindings

ticket #1181


SVN revision: 74187
This commit is contained in:
Mike Blumenkrantz 2012-07-19 13:13:23 +00:00
parent c2ac400f8c
commit 9872898794
2 changed files with 7 additions and 4 deletions

View File

@ -1300,6 +1300,7 @@ ACT_FN_GO(window_zone_move_by, )
int move;
char *end;
E_Fullscreen fs;
Eina_Bool fullscreen;
if (!params) return;
if (!obj) obj = E_OBJECT(e_border_focused_get());
@ -1327,11 +1328,12 @@ ACT_FN_GO(window_zone_move_by, )
if ((!zone) || (zone->num != (unsigned int)move)) return;
max = bd->maximized;
fs = bd->fullscreen_policy;
fullscreen = bd->fullscreen;
if (bd->maximized) e_border_unmaximize(bd, E_MAXIMIZE_BOTH);
if (fs) e_border_unfullscreen(bd);
if (fullscreen) e_border_unfullscreen(bd);
e_border_zone_set(bd, zone);
if (max) e_border_maximize(bd, max);
if (fs) e_border_fullscreen(bd, fs);
if (fullscreen) e_border_fullscreen(bd, fs);
}
/***************************************************************************/

View File

@ -2104,10 +2104,11 @@ _pager_drop_cb_drop(void *data, const char *type, void *event_info)
{
E_Maximize max = bd->maximized;
E_Fullscreen fs = bd->fullscreen_policy;
Eina_Bool fullscreen = bd->fullscreen;
if (bd->iconic) e_border_uniconify(bd);
if (bd->maximized)
e_border_unmaximize(bd, E_MAXIMIZE_BOTH);
if (fs) e_border_unfullscreen(bd);
if (fullscreen) e_border_unfullscreen(bd);
e_border_desk_set(bd, pd->desk);
if ((!pw) || ((pw) && (!pw->drag.no_place)))
{
@ -2123,7 +2124,7 @@ _pager_drop_cb_drop(void *data, const char *type, void *event_info)
e_border_move(bd, nx + zx, ny + zy);
}
if (max) e_border_maximize(bd, max);
if (fs) e_border_fullscreen(bd, fs);
if (fullscreen) e_border_fullscreen(bd, fs);
}
}