aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-08-19 20:42:54 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-08-19 20:42:54 +0800
commit09b8172fb599c1a5dd1971eb4501304915034112 (patch)
tree8512ba6c29ee4400822aeb831b24ed80daea0f9e /src
parentcf84d9a8617e31a5b0a51ed5d56df661ec8f1ede (diff)
downloadgsoc2013-empathy-09b8172fb599c1a5dd1971eb4501304915034112.tar
gsoc2013-empathy-09b8172fb599c1a5dd1971eb4501304915034112.tar.gz
gsoc2013-empathy-09b8172fb599c1a5dd1971eb4501304915034112.tar.bz2
gsoc2013-empathy-09b8172fb599c1a5dd1971eb4501304915034112.tar.lz
gsoc2013-empathy-09b8172fb599c1a5dd1971eb4501304915034112.tar.xz
gsoc2013-empathy-09b8172fb599c1a5dd1971eb4501304915034112.tar.zst
gsoc2013-empathy-09b8172fb599c1a5dd1971eb4501304915034112.zip
Flip the preview in RoundedTexture->paint()
We can't flip the preview clone that we're dragging because of https://bugzilla.gnome.org/show_bug.cgi?id=656894, so directly paint it flipped. Partly fixes: https://bugzilla.gnome.org/show_bug.cgi?id=656887
Diffstat (limited to 'src')
-rw-r--r--src/empathy-call-window.c19
-rw-r--r--src/empathy-rounded-texture.c4
2 files changed, 4 insertions, 19 deletions
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index a0507ebae..8116ea79d 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -875,17 +875,6 @@ empathy_call_window_preview_on_drag_begin_cb (ClutterDragAction *action,
ClutterActor *stage = clutter_actor_get_stage (actor);
ClutterActor *preview = clutter_clone_new (actor);
-#if 0
- /* Flip the video preview */
- /* FIXME: disabled because it makes the drag handle to go away! */
- clutter_actor_set_rotation (preview,
- CLUTTER_Y_AXIS,
- 180,
- SELF_VIDEO_SECTION_WIDTH * 0.5,
- 0.0,
- 0.0);
-#endif
-
clutter_container_add_actor (CLUTTER_CONTAINER (stage), preview);
clutter_actor_set_position (preview, event_x, event_y);
@@ -1000,14 +989,6 @@ create_video_preview (EmpathyCallWindow *self)
priv->video_preview_sink = clutter_gst_video_sink_new (
CLUTTER_TEXTURE (preview));
- /* Flip the video preview */
- clutter_actor_set_rotation (preview,
- CLUTTER_Y_AXIS,
- 180,
- SELF_VIDEO_SECTION_WIDTH * 0.5,
- 0.0,
- 0.0);
-
/* Add a little offset to the video preview */
layout = clutter_bin_layout_new (CLUTTER_BIN_ALIGNMENT_CENTER,
CLUTTER_BIN_ALIGNMENT_START);
diff --git a/src/empathy-rounded-texture.c b/src/empathy-rounded-texture.c
index eb0fbcb26..0619cd13e 100644
--- a/src/empathy-rounded-texture.c
+++ b/src/empathy-rounded-texture.c
@@ -45,6 +45,10 @@ empathy_rounded_texture_paint (ClutterActor *texture)
CLUTTER_ACTOR_CLASS (empathy_rounded_texture_parent_class)->paint (texture);
+ /* Flip */
+ cogl_rectangle_with_texture_coords (0, 0, width, height,
+ 1., 0., 0., 1.);
+
cogl_clip_pop ();
}