From 9e92bfaae78b3bd1f1dfdc9ba02ced18729bef95 Mon Sep 17 00:00:00 2001
From: Dmitry Lyzo <ashephard0@gmail.com>
Date: Sun, 14 Jun 2020 23:37:48 +0300
Subject: [PATCH] Fix subtitle line spacing

---
 .../subtitleappearancehelper.js               | 71 ++++++-------------
 src/plugins/htmlVideoPlayer/plugin.js         |  2 +-
 src/plugins/htmlVideoPlayer/style.css         |  6 ++
 3 files changed, 30 insertions(+), 49 deletions(-)

diff --git a/src/components/subtitlesettings/subtitleappearancehelper.js b/src/components/subtitlesettings/subtitleappearancehelper.js
index bec8156aca..503c81472f 100644
--- a/src/components/subtitlesettings/subtitleappearancehelper.js
+++ b/src/components/subtitlesettings/subtitleappearancehelper.js
@@ -1,55 +1,30 @@
 define([], function () {
     'use strict';
 
-    function getTextStyles(settings, isCue) {
+    function getTextStyles(settings) {
 
         var list = [];
 
-        if (isCue) {
-            switch (settings.textSize || '') {
-
-                case 'smaller':
-                    list.push({ name: 'font-size', value: '.5em' });
-                    break;
-                case 'small':
-                    list.push({ name: 'font-size', value: '.7em' });
-                    break;
-                case 'large':
-                    list.push({ name: 'font-size', value: '1.3em' });
-                    break;
-                case 'larger':
-                    list.push({ name: 'font-size', value: '1.72em' });
-                    break;
-                case 'extralarge':
-                    list.push({ name: 'font-size', value: '2em' });
-                    break;
-                default:
-                case 'medium':
-                    break;
-            }
-        } else {
-            switch (settings.textSize || '') {
-
-                case 'smaller':
-                    list.push({ name: 'font-size', value: '.8em' });
-                    break;
-                case 'small':
-                    list.push({ name: 'font-size', value: 'inherit' });
-                    break;
-                case 'larger':
-                    list.push({ name: 'font-size', value: '2em' });
-                    break;
-                case 'extralarge':
-                    list.push({ name: 'font-size', value: '2.2em' });
-                    break;
-                case 'large':
-                    list.push({ name: 'font-size', value: '1.72em' });
-                    break;
-                default:
-                case 'medium':
-                    list.push({ name: 'font-size', value: '1.36em' });
-                    break;
-            }
+        switch (settings.textSize || '') {
+            case 'smaller':
+                list.push({ name: 'font-size', value: '.8em' });
+                break;
+            case 'small':
+                list.push({ name: 'font-size', value: 'inherit' });
+                break;
+            case 'larger':
+                list.push({ name: 'font-size', value: '2em' });
+                break;
+            case 'extralarge':
+                list.push({ name: 'font-size', value: '2.2em' });
+                break;
+            case 'large':
+                list.push({ name: 'font-size', value: '1.72em' });
+                break;
+            default:
+            case 'medium':
+                list.push({ name: 'font-size', value: '1.36em' });
+                break;
         }
 
         switch (settings.dropShadow || '') {
@@ -122,10 +97,10 @@ define([], function () {
         return [];
     }
 
-    function getStyles(settings, isCue) {
+    function getStyles(settings) {
 
         return {
-            text: getTextStyles(settings, isCue),
+            text: getTextStyles(settings),
             window: getWindowStyles(settings)
         };
     }
diff --git a/src/plugins/htmlVideoPlayer/plugin.js b/src/plugins/htmlVideoPlayer/plugin.js
index cc312bb956..9302612539 100644
--- a/src/plugins/htmlVideoPlayer/plugin.js
+++ b/src/plugins/htmlVideoPlayer/plugin.js
@@ -1178,7 +1178,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
                     document.getElementsByTagName('head')[0].appendChild(styleElem);
                 }
 
-                styleElem.innerHTML = getCueCss(subtitleAppearanceHelper.getStyles(userSettings.getSubtitleAppearanceSettings(), true), '.htmlvideoplayer');
+                styleElem.innerHTML = getCueCss(subtitleAppearanceHelper.getStyles(userSettings.getSubtitleAppearanceSettings()), '.htmlvideoplayer');
             });
         }
 
diff --git a/src/plugins/htmlVideoPlayer/style.css b/src/plugins/htmlVideoPlayer/style.css
index b83a7816f5..0f63e72d7e 100644
--- a/src/plugins/htmlVideoPlayer/style.css
+++ b/src/plugins/htmlVideoPlayer/style.css
@@ -33,6 +33,12 @@ video::-webkit-media-controls {
     text-shadow: 0.14em 0.14em 0.14em rgba(0, 0, 0, 1);
     -webkit-font-smoothing: antialiased;
     font-family: inherit;
+    line-height: normal; /* Restore value. See -webkit-media-text-track-container 'line-height' */
+}
+
+.htmlvideoplayer::-webkit-media-text-track-container {
+    font-size: 170% !important; /* Override element inline style */
+    line-height: 50%; /* Child element cannot set line height smaller than its parent has. This allow smaller values for children */
 }
 
 .htmlvideoplayer-moveupsubtitles::-webkit-media-text-track-display {