From 9872898794e345d2c39965b47ac7dee530e48138 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 19 Jul 2012 13:13:23 +0000 Subject: [PATCH] fix fullscreen window moving using pager/bindings ticket #1181 SVN revision: 74187 --- src/bin/e_actions.c | 6 ++++-- src/modules/pager/e_mod_main.c | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c index 6d757c40c..ff2399cdb 100644 --- a/src/bin/e_actions.c +++ b/src/bin/e_actions.c @@ -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); } /***************************************************************************/ diff --git a/src/modules/pager/e_mod_main.c b/src/modules/pager/e_mod_main.c index b89513ade..599e51eaa 100644 --- a/src/modules/pager/e_mod_main.c +++ b/src/modules/pager/e_mod_main.c @@ -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); } }