diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-08-15 19:58:48 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-08-15 19:58:48 +0800 |
| commit | aeb15b72319f26a86ab30236013a11e6a611e05c (patch) | |
| tree | 060d1fef28ce19c88eeeb15cdfa0af1655421cd5 /src | |
| parent | f682f5076d65a3cc582493d340f409153503f9fe (diff) | |
| download | gsoc2013-empathy-aeb15b72319f26a86ab30236013a11e6a611e05c.tar gsoc2013-empathy-aeb15b72319f26a86ab30236013a11e6a611e05c.tar.gz gsoc2013-empathy-aeb15b72319f26a86ab30236013a11e6a611e05c.tar.bz2 gsoc2013-empathy-aeb15b72319f26a86ab30236013a11e6a611e05c.tar.lz gsoc2013-empathy-aeb15b72319f26a86ab30236013a11e6a611e05c.tar.xz gsoc2013-empathy-aeb15b72319f26a86ab30236013a11e6a611e05c.tar.zst gsoc2013-empathy-aeb15b72319f26a86ab30236013a11e6a611e05c.zip | |
Don't define the same thing twice
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-call-window.c | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index aabe7c922..361e0235f 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -79,8 +79,6 @@ #define FLOATING_TOOLBAR_HEIGHT 36 #define FLOATING_TOOLBAR_SPACING 20 -#define SELF_VIDEO_MARGIN 10 - /* The avatar's default width and height are set to the same value because we want a square icon. */ #define REMOTE_CONTACT_AVATAR_DEFAULT_WIDTH EMPATHY_VIDEO_WIDGET_DEFAULT_HEIGHT @@ -562,8 +560,8 @@ empathy_call_window_create_preview_rectangle (EmpathyCallWindow *self, 1); clutter_actor_set_size (box1, - SELF_VIDEO_SECTION_WIDTH + 2 * SELF_VIDEO_MARGIN, - SELF_VIDEO_SECTION_HEIGTH + 2 * SELF_VIDEO_MARGIN + + SELF_VIDEO_SECTION_WIDTH + 2 * SELF_VIDEO_SECTION_MARGIN, + SELF_VIDEO_SECTION_HEIGTH + 2 * SELF_VIDEO_SECTION_MARGIN + FLOATING_TOOLBAR_HEIGHT + FLOATING_TOOLBAR_SPACING); layout2 = clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_CENTER, @@ -575,8 +573,8 @@ empathy_call_window_create_preview_rectangle (EmpathyCallWindow *self, box2 = clutter_box_new (layout2); clutter_actor_set_size (box2, - SELF_VIDEO_SECTION_WIDTH + 2 * SELF_VIDEO_MARGIN, - SELF_VIDEO_SECTION_HEIGTH + 2 * SELF_VIDEO_MARGIN); + SELF_VIDEO_SECTION_WIDTH + 2 * SELF_VIDEO_SECTION_MARGIN, + SELF_VIDEO_SECTION_HEIGTH + 2 * SELF_VIDEO_SECTION_MARGIN); clutter_actor_set_size (rectangle, SELF_VIDEO_SECTION_WIDTH + 5, SELF_VIDEO_SECTION_HEIGTH + 5); @@ -629,31 +627,31 @@ empathy_call_window_get_preview_position (EmpathyCallWindow *self, clutter_actor_get_geometry (self->priv->video_box, &box); - if (0 + SELF_VIDEO_MARGIN <= event_x && - event_x <= (0 + SELF_VIDEO_MARGIN + (gint) SELF_VIDEO_SECTION_WIDTH) && - 0 + SELF_VIDEO_MARGIN <= event_y && - event_y <= (0 + SELF_VIDEO_MARGIN + (gint) SELF_VIDEO_SECTION_HEIGTH)) + if (0 + SELF_VIDEO_SECTION_MARGIN <= event_x && + event_x <= (0 + SELF_VIDEO_SECTION_MARGIN + (gint) SELF_VIDEO_SECTION_WIDTH) && + 0 + SELF_VIDEO_SECTION_MARGIN <= event_y && + event_y <= (0 + SELF_VIDEO_SECTION_MARGIN + (gint) SELF_VIDEO_SECTION_HEIGTH)) { pos = PREVIEW_POS_TOP_LEFT; } - else if (box.width - SELF_VIDEO_MARGIN >= event_x && - event_x >= (box.width - SELF_VIDEO_MARGIN - (gint) SELF_VIDEO_SECTION_WIDTH) && - 0 + SELF_VIDEO_MARGIN <= event_y && - event_y <= (0 + SELF_VIDEO_MARGIN + (gint) SELF_VIDEO_SECTION_HEIGTH)) + else if (box.width - SELF_VIDEO_SECTION_MARGIN >= event_x && + event_x >= (box.width - SELF_VIDEO_SECTION_MARGIN - (gint) SELF_VIDEO_SECTION_WIDTH) && + 0 + SELF_VIDEO_SECTION_MARGIN <= event_y && + event_y <= (0 + SELF_VIDEO_SECTION_MARGIN + (gint) SELF_VIDEO_SECTION_HEIGTH)) { pos = PREVIEW_POS_TOP_RIGHT; } - else if (0 + SELF_VIDEO_MARGIN <= event_x && - event_x <= (0 + SELF_VIDEO_MARGIN + (gint) SELF_VIDEO_SECTION_WIDTH) && - box.height - SELF_VIDEO_MARGIN - FLOATING_TOOLBAR_HEIGHT - FLOATING_TOOLBAR_SPACING >= event_y && - event_y >= (box.height - SELF_VIDEO_MARGIN - FLOATING_TOOLBAR_HEIGHT - FLOATING_TOOLBAR_SPACING - (gint) SELF_VIDEO_SECTION_HEIGTH)) + else if (0 + SELF_VIDEO_SECTION_MARGIN <= event_x && + event_x <= (0 + SELF_VIDEO_SECTION_MARGIN + (gint) SELF_VIDEO_SECTION_WIDTH) && + box.height - SELF_VIDEO_SECTION_MARGIN - FLOATING_TOOLBAR_HEIGHT - FLOATING_TOOLBAR_SPACING >= event_y && + event_y >= (box.height - SELF_VIDEO_SECTION_MARGIN - FLOATING_TOOLBAR_HEIGHT - FLOATING_TOOLBAR_SPACING - (gint) SELF_VIDEO_SECTION_HEIGTH)) { pos = PREVIEW_POS_BOTTOM_LEFT; } - else if (box.width - SELF_VIDEO_MARGIN >= event_x && - event_x >= (box.width - SELF_VIDEO_MARGIN - (gint) SELF_VIDEO_SECTION_WIDTH) && - box.height - SELF_VIDEO_MARGIN - SELF_VIDEO_MARGIN - FLOATING_TOOLBAR_HEIGHT - FLOATING_TOOLBAR_SPACING >= event_y && - event_y >= (box.height - SELF_VIDEO_MARGIN - FLOATING_TOOLBAR_HEIGHT - FLOATING_TOOLBAR_SPACING - (gint) SELF_VIDEO_SECTION_HEIGTH)) + else if (box.width - SELF_VIDEO_SECTION_MARGIN >= event_x && + event_x >= (box.width - SELF_VIDEO_SECTION_MARGIN - (gint) SELF_VIDEO_SECTION_WIDTH) && + box.height - SELF_VIDEO_SECTION_MARGIN - SELF_VIDEO_SECTION_MARGIN - FLOATING_TOOLBAR_HEIGHT - FLOATING_TOOLBAR_SPACING >= event_y && + event_y >= (box.height - SELF_VIDEO_SECTION_MARGIN - FLOATING_TOOLBAR_HEIGHT - FLOATING_TOOLBAR_SPACING - (gint) SELF_VIDEO_SECTION_HEIGTH)) { pos = PREVIEW_POS_BOTTOM_RIGHT; } |