From: Vincent Penquerc'h <vincent.penquerch@collabora.co.uk>
Date: Wed, 18 Mar 2015 16:32:53 +0000 (+0000)
Subject: textoverlay: fix disappearing text with high deltax
X-Git-Tag: 1.19.3~511^2~3731
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b247001aa9e562cc90f306362046d7ad42220a45;p=platform%2Fupstream%2Fgstreamer.git

textoverlay: fix disappearing text with high deltax

When deltax is large enough to cause the text to push past the
width of the frame, it would disappear due to a bug in setting
the layout width.

While there, fix a log printing an incorrect width to set.

https://bugzilla.gnome.org/show_bug.cgi?id=739689
---

diff --git a/ext/pango/gstbasetextoverlay.c b/ext/pango/gstbasetextoverlay.c
index a300f32689..1dc14b1bf0 100644
--- a/ext/pango/gstbasetextoverlay.c
+++ b/ext/pango/gstbasetextoverlay.c
@@ -670,11 +670,11 @@ gst_base_text_overlay_update_wrap_mode (GstBaseTextOverlay * overlay)
       }
     } else {
       width =
-          (overlay->use_vertical_render ? overlay->height : overlay->width) *
-          PANGO_SCALE;
+          ((overlay->use_vertical_render ? overlay->height : overlay->width) -
+          overlay->deltax) * PANGO_SCALE;
     }
 
-    GST_DEBUG_OBJECT (overlay, "Set layout width %d", overlay->width);
+    GST_DEBUG_OBJECT (overlay, "Set layout width %d", width);
     GST_DEBUG_OBJECT (overlay, "Set wrap mode    %d", overlay->wrap_mode);
     pango_layout_set_width (overlay->layout, width);
     pango_layout_set_wrap (overlay->layout, (PangoWrapMode) overlay->wrap_mode);