Fix fullscreen on desktop change (patch by Hannes Janetzek).

SVN revision: 33066

diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 4f597ed..b57e5bb 100644 (file)
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -718,8 +718,6 @@ e_border_hide(E_Border *bd, int manage)
    ecore_x_window_shadow_tree_flush();
    if (bd->moving)
      _e_border_move_end(bd);
-   if (bd->fullscreen)
-     e_border_unfullscreen(bd);
    if (bd->resize_mode != RESIZE_NONE)
      {
        _e_border_pointer_resize_end(bd);

diff --git a/src/bin/e_border.h b/src/bin/e_border.h
index afc70c4..f5a211b 100644 (file)
--- a/src/bin/e_border.h
+++ b/src/bin/e_border.h
@@ -352,7 +352,6 @@ struct _E_Border
    unsigned int    need_shape_export : 1;
    unsigned int    fullscreen : 1;
    unsigned int    need_fullscreen : 1;
-   unsigned int    want_fullscreen : 1;
    unsigned int    already_unparented : 1;
    unsigned int    need_reparent : 1;
    unsigned int    button_grabbed : 1;

diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 7bef304..913b5a6 100644 (file)
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -244,17 +244,11 @@ e_desk_show(E_Desk *desk)
                  if ((bd->desk == desk) || (bd->sticky))
                    {
                       e_border_show(bd);
-                      if (bd->want_fullscreen)
-                        {
-                           e_border_fullscreen(bd, e_config->fullscreen_policy);
-                           bd->want_fullscreen = 0;
-                        }
                    }
                  else if (bd->moving)
                    e_border_desk_set(bd, desk);
                  else
                    {
-                      if (bd->fullscreen) bd->want_fullscreen = 1;
                       e_border_hide(bd, 2);
                    }
               }
@@ -599,11 +593,6 @@ _e_desk_show_begin(E_Desk *desk, int mode, int dx, int dy)
                    bd->fx.start.y += bd->zone->container->h - (bd->zone->y + bd->zone->h);
                  e_border_fx_offset(bd, bd->fx.start.x, bd->fx.start.y);
                  e_border_show(bd);
-                 if (bd->want_fullscreen)
-                   {
-                      e_border_fullscreen(bd, e_config->fullscreen_policy);
-                      bd->want_fullscreen = 0;
-                   }
               }
          }
      }
@@ -737,11 +726,6 @@ _e_desk_hide_begin(E_Desk *desk, int mode, int dx, int dy)
                  else
                    bd->fx.start.y += bd->zone->container->h - (bd->zone->y + bd->zone->h);
                  e_border_fx_offset(bd, 0, 0);
-                 if (bd->want_fullscreen)
-                   {
-                      e_border_fullscreen(bd, e_config->fullscreen_policy);
-                      bd->want_fullscreen = 0;
-                   }
               }
          }
      }
@@ -766,7 +750,6 @@ _e_desk_hide_end(E_Desk *desk)
             else if ((bd->desk == desk) && (!bd->sticky))
               {
                  e_border_fx_offset(bd, 0, 0);
-                 if (bd->fullscreen) bd->want_fullscreen = 1;
                  e_border_hide(bd, 2);
               }
          }