Skip to content

Commit ccb7213

Browse files
committed
meta-x11-background-actor.c: Don't override the bottom actor's opacity
when it's not mapped or there's no transition. In situations where the window group containing the backgrounds is temporarily hidden (like in expo/overview), this could permanently break the slideshow transition.
1 parent 2157214 commit ccb7213

1 file changed

Lines changed: 2 additions & 7 deletions

File tree

src/x11/meta-x11-background-actor.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -237,18 +237,13 @@ set_texture_on_actor (MetaX11BackgroundActor *self)
237237
if (background_transition == META_X11_BACKGROUND_TRANSITION_NONE ||
238238
!clutter_actor_is_mapped (priv->top_actor))
239239
{
240-
// NO TRANSITION
241-
clutter_actor_set_opacity (CLUTTER_ACTOR (priv->bottom_actor), 0);
242240
meta_x11_background_set_layer (META_X11_BACKGROUND (priv->top_actor), priv->background->texture);
243241
on_transition_complete (priv->top_actor, self);
244242
}
245243
else
246244
{
247-
if (background_transition == META_X11_BACKGROUND_TRANSITION_FADEIN)
248-
{
249-
// FADE_IN TRANSITION
250-
clutter_actor_set_opacity (CLUTTER_ACTOR (priv->bottom_actor), 0);
251-
}
245+
clutter_actor_set_opacity (CLUTTER_ACTOR (priv->bottom_actor),
246+
background_transition == META_X11_BACKGROUND_TRANSITION_FADEIN ? 0 : 255);
252247

253248
// BLEND TRANSITION
254249
clutter_actor_set_opacity (CLUTTER_ACTOR (priv->top_actor), 0);

0 commit comments

Comments
 (0)