Merge pull request xbmc#8097 from fritsch/subdisplay

Fix position outside of video for text based subs
margro · Sep 20, 2015 · a1431e1 · a1431e1
2 parents 9f3e337 + 3174a4f
commit a1431e1
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/xbmc/cores/VideoRenderers/OverlayRendererGUI.cpp b/xbmc/cores/VideoRenderers/OverlayRendererGUI.cpp
@@ -125,11 +125,17 @@ COverlayText::COverlayText(CDVDOverlayText * src)
   }
   else
   {
-    m_align  = ALIGN_VIDEO;
+    if(m_subalign == SUBTITLE_ALIGN_TOP_INSIDE ||
+       m_subalign == SUBTITLE_ALIGN_TOP_OUTSIDE)
+      m_align  = ALIGN_VIDEO;
+    else
+      m_align = ALIGN_SCREEN;
+
     m_pos    = POSITION_RELATIVE;
     m_x      = 0.5f;
-    if(m_subalign == SUBTITLE_ALIGN_TOP_INSIDE
-    || m_subalign == SUBTITLE_ALIGN_TOP_OUTSIDE)
+
+    if(m_subalign == SUBTITLE_ALIGN_TOP_INSIDE ||
+       m_subalign == SUBTITLE_ALIGN_TOP_OUTSIDE)
       m_y    = 0.0f;
     else
       m_y    = 1.0f;