aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd@luon.net>2012-05-21 16:00:21 +0800
committerSjoerd Simons <sjoerd@luon.net>2012-05-21 19:54:00 +0800
commit0343d38411f58086366190100521c6a847985c13 (patch)
tree316d7e8ff80bc643d5c41d5a242c4577af8e8ff1
parent1fa90edcd725ae7ac78a3caed904b3e382e25560 (diff)
downloadgsoc2013-empathy-0343d38411f58086366190100521c6a847985c13.tar
gsoc2013-empathy-0343d38411f58086366190100521c6a847985c13.tar.gz
gsoc2013-empathy-0343d38411f58086366190100521c6a847985c13.tar.bz2
gsoc2013-empathy-0343d38411f58086366190100521c6a847985c13.tar.lz
gsoc2013-empathy-0343d38411f58086366190100521c6a847985c13.tar.xz
gsoc2013-empathy-0343d38411f58086366190100521c6a847985c13.tar.zst
gsoc2013-empathy-0343d38411f58086366190100521c6a847985c13.zip
Keep some margin for the preview and the floating toolbar
Now that the video box is flush against the sides add some extra margin for the things floating inside.
-rw-r--r--src/empathy-call-window.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 23c250dca..7577abd11 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -75,6 +75,7 @@
#define CONTENT_HBOX_SPACING 3
#define CONTENT_HBOX_CHILDREN_PACKING_PADDING 0
+#define OVERLAY_MARGIN 6
#define SELF_VIDEO_SECTION_WIDTH 120
#define SELF_VIDEO_SECTION_HEIGHT 90
@@ -1550,6 +1551,8 @@ empathy_call_window_init (EmpathyCallWindow *self)
ClutterActor *remote_avatar;
GtkCssProvider *provider;
ClutterColor black = { 0, 0, 0, 0 };
+ ClutterMargin overlay_margin = { OVERLAY_MARGIN, OVERLAY_MARGIN,
+ OVERLAY_MARGIN, OVERLAY_MARGIN };
priv = self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
EMPATHY_TYPE_CALL_WINDOW, EmpathyCallWindowPriv);
@@ -1683,7 +1686,10 @@ empathy_call_window_init (EmpathyCallWindow *self)
priv->overlay_layout = clutter_box_layout_new ();
clutter_box_layout_set_vertical (
CLUTTER_BOX_LAYOUT (priv->overlay_layout), TRUE);
- priv->overlay_box = clutter_box_new (priv->overlay_layout);
+ priv->overlay_box = clutter_actor_new ();
+ clutter_actor_set_layout_manager (priv->overlay_box, priv->overlay_layout);
+
+ clutter_actor_set_margin (priv->overlay_box, &overlay_margin);
clutter_bin_layout_add (CLUTTER_BIN_LAYOUT (priv->video_layout),
priv->overlay_box,