mirror of
https://github.com/brl/mutter.git
synced 2024-11-25 01:20:42 -05:00
window: Don't reset pending_compositor_effect too early
With our surface_mapped strategy, implement_showing might not change whether the window has been shown or not, and thus we might end up clearing pending_compositor_effect before the window is mapped. Only clear pending_compositor_effect when the effect has actually been used.
This commit is contained in:
parent
eb0c4db46d
commit
f0175d1234
@ -1842,8 +1842,6 @@ implement_showing (MetaWindow *window,
|
||||
}
|
||||
else
|
||||
meta_window_show (window);
|
||||
|
||||
window->pending_compositor_effect = META_COMP_EFFECT_NONE;
|
||||
}
|
||||
|
||||
void
|
||||
@ -2619,6 +2617,7 @@ meta_window_show (MetaWindow *window)
|
||||
|
||||
meta_compositor_show_window (window->display->compositor,
|
||||
window, effect);
|
||||
window->pending_compositor_effect = META_COMP_EFFECT_NONE;
|
||||
}
|
||||
|
||||
/* We don't want to worry about all cases from inside
|
||||
@ -2708,6 +2707,7 @@ meta_window_hide (MetaWindow *window)
|
||||
}
|
||||
|
||||
meta_compositor_hide_window (window->display->compositor, window, effect);
|
||||
window->pending_compositor_effect = META_COMP_EFFECT_NONE;
|
||||
}
|
||||
|
||||
did_hide = FALSE;
|
||||
|
Loading…
Reference in New Issue
Block a user