]> git.0d.be Git - empathy.git/commitdiff
call-window: raise the overlay actor instead of individual actors
authorCosimo Cecchi <cosimoc@gnome.org>
Thu, 29 Mar 2012 16:08:40 +0000 (12:08 -0400)
committerCosimo Cecchi <cosimoc@gnome.org>
Fri, 30 Mar 2012 15:40:15 +0000 (11:40 -0400)
Or the actors will be raised relative to their box, but not relative to
the whole scene.

https://bugzilla.gnome.org/show_bug.cgi?id=673046

src/empathy-call-window.c

index 71c1a975e1f58871bbe1db5f694b6932230c603f..3b05d4d7a500490ba2f0804c15b9336c0b9be5bc 100644 (file)
@@ -376,17 +376,6 @@ dtmf_start_tone_cb (EmpathyDialpadWidget *dialpad,
   g_object_unref (call);
 }
 
-static void
-empathy_call_window_raise_actors (EmpathyCallWindow *self)
-{
-  clutter_actor_raise_top (self->priv->floating_toolbar);
-
-  clutter_actor_raise_top (self->priv->preview_rectangle1);
-  clutter_actor_raise_top (self->priv->preview_rectangle2);
-  clutter_actor_raise_top (self->priv->preview_rectangle3);
-  clutter_actor_raise_top (self->priv->preview_rectangle4);
-}
-
 static void
 empathy_call_window_show_video_output (EmpathyCallWindow *self,
     gboolean show)
@@ -396,7 +385,7 @@ empathy_call_window_show_video_output (EmpathyCallWindow *self,
 
   gtk_widget_set_visible (self->priv->remote_user_avatar_widget, !show);
 
-  empathy_call_window_raise_actors (self);
+  clutter_actor_raise_top (self->priv->overlay_box);
 }
 
 static void
@@ -3234,7 +3223,7 @@ empathy_call_window_show_video_output_cb (gpointer user_data)
     {
       gtk_widget_hide (self->priv->remote_user_avatar_widget);
       clutter_actor_show (self->priv->video_output);
-      empathy_call_window_raise_actors (self);
+      clutter_actor_raise_top (self->priv->overlay_box);
     }
 
   return FALSE;