isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 08:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Do not run map effect if the map is because window is getting redecorated.

Browse Source
This commit is contained in:
Tomas Frydrych 2009-02-11 14:20:01 +00:00
parent ed3d222327
commit fb1fc4e7c6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/compositor/mutter/compositor-mutter.c
View File

@ -192,6 +192,7 @@ struct _MutterWindowPrivate
guint disposed : 1; guint disposed : 1;
guint is_minimized : 1; guint is_minimized : 1;
guint hide_after_effect : 1; guint hide_after_effect : 1;
guint redecorating : 1;
/* Desktop switching flags */ /* Desktop switching flags */
guint needs_map : 1; guint needs_map : 1;
@ -331,6 +332,7 @@ mutter_meta_window_decorated_notify (MetaWindow *mw,
* Basically, we have to reconstruct the the internals of this object * Basically, we have to reconstruct the the internals of this object
* from scratch, as everything has changed. * from scratch, as everything has changed.
*/ */
priv->redecorating = TRUE;
if (frame) if (frame)
new_xwindow = meta_frame_get_xwindow (frame); new_xwindow = meta_frame_get_xwindow (frame);
@ -1311,7 +1313,8 @@ map_win (MutterWindow *cw)
* If a plugin manager is present, try to run an effect; if no effect of this * If a plugin manager is present, try to run an effect; if no effect of this
* type is present, destroy the actor. * type is present, destroy the actor.
*/ */
if (info->switch_workspace_in_progress || !info->plugin_mgr || if (priv->redecorating ||
info->switch_workspace_in_progress || !info->plugin_mgr ||
!mutter_plugin_manager_event_simple (info->plugin_mgr, !mutter_plugin_manager_event_simple (info->plugin_mgr,
cw, cw,
MUTTER_PLUGIN_MAP)) MUTTER_PLUGIN_MAP))
@ -1319,6 +1322,7 @@ map_win (MutterWindow *cw)
clutter_actor_show_all (CLUTTER_ACTOR (cw)); clutter_actor_show_all (CLUTTER_ACTOR (cw));
priv->map_in_progress--; priv->map_in_progress--;
priv->is_minimized = FALSE; priv->is_minimized = FALSE;
priv->redecorating = FALSE;
} }
} }