projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
079f89c
)
First go at making the line spacing do something.
author
Carl Hetherington
<cth@carlh.net>
Sat, 28 May 2016 23:42:55 +0000
(
00:42
+0100)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 1 Jul 2016 00:05:06 +0000
(
01:05
+0100)
src/lib/subtitle_decoder.cc
patch
|
blob
|
history
diff --git
a/src/lib/subtitle_decoder.cc
b/src/lib/subtitle_decoder.cc
index 9fb66b74f6a6407d493367d7ec6b06f3dfaf55d6..ef9d8384be0a7b09ab6fd2772ad665fa45a5549e 100644
(file)
--- 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);
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.
*/
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);
v_align = dcp::VALIGN_TOP;
} else {
DCPOMATIC_ASSERT (i.vertical_position.proportional);