aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-08-16 07:41:56 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-08-16 18:13:58 +0800
commitd7c83fa38cb8ce5f60e8fc7a8781ddc1f21a5acc (patch)
tree791b1321722fdca95d7f405255a318d2467c42fb /src
parent3a9a3210bbf8e927ef64510d066c035aa60a8a50 (diff)
downloadgsoc2013-empathy-d7c83fa38cb8ce5f60e8fc7a8781ddc1f21a5acc.tar
gsoc2013-empathy-d7c83fa38cb8ce5f60e8fc7a8781ddc1f21a5acc.tar.gz
gsoc2013-empathy-d7c83fa38cb8ce5f60e8fc7a8781ddc1f21a5acc.tar.bz2
gsoc2013-empathy-d7c83fa38cb8ce5f60e8fc7a8781ddc1f21a5acc.tar.lz
gsoc2013-empathy-d7c83fa38cb8ce5f60e8fc7a8781ddc1f21a5acc.tar.xz
gsoc2013-empathy-d7c83fa38cb8ce5f60e8fc7a8781ddc1f21a5acc.tar.zst
gsoc2013-empathy-d7c83fa38cb8ce5f60e8fc7a8781ddc1f21a5acc.zip
Display the preview video button in the preview corner
https://bugzilla.gnome.org/show_bug.cgi?id=656571
Diffstat (limited to 'src')
-rw-r--r--src/empathy-call-window.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index b56613ca5..5bcf4644a 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -931,7 +931,7 @@ static void
create_video_preview (EmpathyCallWindow *self)
{
EmpathyCallWindowPriv *priv = GET_PRIV (self);
- ClutterLayoutManager *layout, *layout_center;
+ ClutterLayoutManager *layout, *layout_center, *layout_end;
ClutterActor *preview;
ClutterActor *box;
ClutterActor *b;
@@ -986,10 +986,15 @@ create_video_preview (EmpathyCallWindow *self)
button = gtk_button_new_with_label (_("i"));
b = gtk_clutter_actor_new_with_contents (button);
- clutter_bin_layout_add (CLUTTER_BIN_LAYOUT (layout_center),
- b,
- CLUTTER_BIN_ALIGNMENT_END,
+ layout_end = clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_END,
CLUTTER_BIN_ALIGNMENT_END);
+ box = clutter_box_new (layout_end);
+ clutter_actor_set_size (box,
+ SELF_VIDEO_SECTION_WIDTH,
+ SELF_VIDEO_SECTION_HEIGTH + SELF_VIDEO_SECTION_MARGIN);
+
+ clutter_container_add_actor (CLUTTER_CONTAINER (box), b);
+ clutter_container_add_actor (CLUTTER_CONTAINER (priv->video_preview), box);
g_signal_connect (button, "clicked",
G_CALLBACK (empathy_call_window_preview_button_clicked_cb),