summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-10-30 10:36:48 +0000
committerCarl Hetherington <cth@carlh.net>2016-11-08 11:23:00 +0000
commit2093ef3c9eeb4e30c7d636ede8c77e9ce5d74a52 (patch)
treebf257223e5cb72976b3633ccfb5363fd98781473 /src/lib
parent885de94a17a39314fd2c1fd97a8df953eb3d4031 (diff)
Merge cherry-pick of fix for #946.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/render_subtitles.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/render_subtitles.cc b/src/lib/render_subtitles.cc
index aa03aefe1..24717398f 100644
--- a/src/lib/render_subtitles.cc
+++ b/src/lib/render_subtitles.cc
@@ -254,12 +254,14 @@ render_line (list<SubtitleString> subtitles, list<shared_ptr<Font> > fonts, dcp:
side of the first character's border is not cut off.
*/
int const x_offset = subtitles.front().effect() == dcp::BORDER ? (target.width / 600.0) : 0;
+ /* Move down a bit so that accents on capital letters can be seen */
+ int const y_offset = target.height / 100.0;
if (subtitles.front().effect() == dcp::SHADOW) {
/* Drop-shadow effect */
dcp::Colour const ec = subtitles.front().effect_colour ();
context->set_source_rgba (float(ec.r) / 255, float(ec.g) / 255, float(ec.b) / 255, fade_factor);
- context->move_to (x_offset + 4, 4);
+ context->move_to (x_offset + 4, y_offset + 4);
layout->add_to_cairo_context (context);
context->fill ();
}
@@ -270,7 +272,7 @@ render_line (list<SubtitleString> subtitles, list<shared_ptr<Font> > fonts, dcp:
context->set_source_rgba (float(ec.r) / 255, float(ec.g) / 255, float(ec.b) / 255, fade_factor);
context->set_line_width (subtitles.front().outline_width * target.width / 2048.0);
context->set_line_join (Cairo::LINE_JOIN_ROUND);
- context->move_to (x_offset, 0);
+ context->move_to (x_offset, y_offset);
layout->add_to_cairo_context (context);
context->stroke ();
}
@@ -278,7 +280,7 @@ render_line (list<SubtitleString> subtitles, list<shared_ptr<Font> > fonts, dcp:
/* The actual subtitle */
context->set_line_width (0);
- context->move_to (x_offset, 0);
+ context->move_to (x_offset, y_offset);
layout->show_in_cairo_context (context);
int layout_width;