e: No need for was_fullscreen anymore

Fixed the issue with unfullscreen on desk change, and fullscreen on
focus is confusing.

SVN revision: 77349
This commit is contained in:
Sebastian Dransfeld 2012-10-03 08:03:39 +00:00
parent 5c97097053
commit 6b479fae34
2 changed files with 3 additions and 18 deletions

View File

@ -2205,11 +2205,6 @@ e_border_focus_set(E_Border *bd,
e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_PASSIVE); e_grabinput_focus(bd->client.win, E_FOCUS_METHOD_PASSIVE);
/* e_border_focus_set(bd, 1, 0); */ /* e_border_focus_set(bd, 1, 0); */
} }
if (bd->was_fullscreen)
{
bd->need_fullscreen = 1;
bd->was_fullscreen = 0;
}
return; return;
} }
@ -2246,10 +2241,7 @@ e_border_focus_set(E_Border *bd,
bd_parent = bd->parent; bd_parent = bd->parent;
} }
if (!unfocus_is_parent) if (!unfocus_is_parent)
{ e_border_unfullscreen(bd2);
e_border_unfullscreen(bd2);
bd2->was_fullscreen = 1;
}
} }
} }
} }
@ -2302,10 +2294,7 @@ e_border_focus_set(E_Border *bd,
} }
} }
if (!have_vis_child) if (!have_vis_child)
{ e_border_unfullscreen(bd);
e_border_unfullscreen(bd);
bd->was_fullscreen = 1;
}
} }
} }
} }
@ -2354,10 +2343,7 @@ e_border_focus_set(E_Border *bd,
bd_parent = bd->parent; bd_parent = bd->parent;
} }
if (!unfocus_is_parent) if (!unfocus_is_parent)
{ e_border_unfullscreen(bd_unfocus);
e_border_unfullscreen(bd_unfocus);
bd_unfocus->was_fullscreen = 1;
}
} }
} }

View File

@ -490,7 +490,6 @@ struct _E_Border
unsigned int need_shape_merge : 1; unsigned int need_shape_merge : 1;
unsigned int need_shape_export : 1; unsigned int need_shape_export : 1;
unsigned int fullscreen : 1; unsigned int fullscreen : 1;
unsigned int was_fullscreen : 1;
unsigned int need_fullscreen : 1; unsigned int need_fullscreen : 1;
unsigned int already_unparented : 1; unsigned int already_unparented : 1;
unsigned int need_reparent : 1; unsigned int need_reparent : 1;