aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-08-17 20:21:40 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-08-19 17:27:27 +0800
commit08af50eabef5f5a18ced797fd2fd967c08a13198 (patch)
treed1871d2560731e20e9c3fa368b390ba1d50a1421 /src
parentc1eb12ebde6572a01744a8120440e630c8920d3a (diff)
downloadgsoc2013-empathy-08af50eabef5f5a18ced797fd2fd967c08a13198.tar
gsoc2013-empathy-08af50eabef5f5a18ced797fd2fd967c08a13198.tar.gz
gsoc2013-empathy-08af50eabef5f5a18ced797fd2fd967c08a13198.tar.bz2
gsoc2013-empathy-08af50eabef5f5a18ced797fd2fd967c08a13198.tar.lz
gsoc2013-empathy-08af50eabef5f5a18ced797fd2fd967c08a13198.tar.xz
gsoc2013-empathy-08af50eabef5f5a18ced797fd2fd967c08a13198.tar.zst
gsoc2013-empathy-08af50eabef5f5a18ced797fd2fd967c08a13198.zip
CallWindow: make the rectangles have rounded corners
https://bugzilla.gnome.org/show_bug.cgi?id=656576
Diffstat (limited to 'src')
-rw-r--r--src/empathy-call-window.c26
1 files changed, 12 insertions, 14 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index ffc94225b..f5551f566 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -65,6 +65,7 @@
#include "empathy-mic-menu.h"
#include "empathy-preferences.h"
#include "empathy-rounded-actor.h"
+#include "empathy-rounded-rectangle.h"
#include "empathy-rounded-texture.h"
#include "empathy-camera-menu.h"
@@ -635,11 +636,9 @@ empathy_call_window_create_preview_rectangle (EmpathyCallWindow *self,
*box = box1;
- rectangle = clutter_rectangle_new_with_color (
- CLUTTER_COLOR_Transparent);
-
- clutter_rectangle_set_border_width (CLUTTER_RECTANGLE (rectangle),
- 1);
+ rectangle = empathy_rounded_rectangle_new (
+ SELF_VIDEO_SECTION_WIDTH + 5,
+ SELF_VIDEO_SECTION_HEIGHT + 5);
clutter_actor_set_size (box1,
SELF_VIDEO_SECTION_WIDTH + 2 * SELF_VIDEO_SECTION_MARGIN,
@@ -658,9 +657,6 @@ empathy_call_window_create_preview_rectangle (EmpathyCallWindow *self,
SELF_VIDEO_SECTION_WIDTH + 2 * SELF_VIDEO_SECTION_MARGIN,
SELF_VIDEO_SECTION_HEIGHT + 2 * SELF_VIDEO_SECTION_MARGIN);
- clutter_actor_set_size (rectangle,
- SELF_VIDEO_SECTION_WIDTH + 5, SELF_VIDEO_SECTION_HEIGHT + 5);
-
clutter_container_add_actor (CLUTTER_CONTAINER (box1), box2);
clutter_container_add_actor (CLUTTER_CONTAINER (box2), rectangle);
@@ -824,18 +820,20 @@ empathy_call_window_highlight_preview_rectangle (EmpathyCallWindow *self,
rectangle = empathy_call_window_get_preview_rectangle (self, pos);
- clutter_rectangle_set_border_width (CLUTTER_RECTANGLE (rectangle), 3);
- clutter_rectangle_set_border_color (CLUTTER_RECTANGLE (rectangle),
- CLUTTER_COLOR_Red);
+ empathy_rounded_rectangle_set_border_width (
+ EMPATHY_ROUNDED_RECTANGLE (rectangle), 5);
+ empathy_rounded_rectangle_set_border_color (
+ EMPATHY_ROUNDED_RECTANGLE (rectangle), CLUTTER_COLOR_Red);
}
static void
empathy_call_window_darken_preview_rectangle (EmpathyCallWindow *self,
ClutterActor *rectangle)
{
- clutter_rectangle_set_border_width (CLUTTER_RECTANGLE (rectangle), 1);
- clutter_rectangle_set_border_color (CLUTTER_RECTANGLE (rectangle),
- CLUTTER_COLOR_Black);
+ empathy_rounded_rectangle_set_border_width (
+ EMPATHY_ROUNDED_RECTANGLE (rectangle), 1);
+ empathy_rounded_rectangle_set_border_color (
+ EMPATHY_ROUNDED_RECTANGLE (rectangle), CLUTTER_COLOR_Black);
}
static void