From: Carl Hetherington <cth@carlh.net>
Date: Sat, 28 May 2016 23:42:55 +0000 (+0100)
Subject: First go at making the line spacing do something.
X-Git-Tag: v2.8.15~9
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=2894023433c3addfb04ba7ae0be534e251b641b9;ds=sidebyside

First go at making the line spacing do something.
---

diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index 9fb66b74f..ef9d8384b 100644
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -165,10 +165,12 @@ SubtitleDecoder::give_text (ContentTimePeriod period, sub::Subtitle const & subt
 			dcp::VAlign v_align;
 			if (needs_placement) {
 				DCPOMATIC_ASSERT (i.vertical_position.line);
-				/* This 0.053 is an arbitrary value to lift the bottom sub off the bottom
+				/* This 1.015 is an arbitrary value to lift the bottom sub off the bottom
 				   of the screen a bit to a pleasing degree.
 				*/
-				v_position = 1.015 - (1 + bottom_line.get() - i.vertical_position.line.get()) * 1.2 * j.font_size.proportional (72 * 11);
+				v_position = 1.015 - (1 + bottom_line.get() - i.vertical_position.line.get())
+					* 1.2 * content()->line_spacing() * j.font_size.proportional (72 * 11);
+
 				v_align = dcp::VALIGN_TOP;
 			} else {
 				DCPOMATIC_ASSERT (i.vertical_position.proportional);