From d6c46607da7c4f51d94deb1828612611b54ca74f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Thu, 30 Jun 2011 23:00:38 +0000
Subject: [PATCH] * Enabled the "keep subtitles visible when the controls are
 visible" mode   in the "subtitles at the bottom of video" setting, too. *
 Nice surprise to see a feature I wanted to implement already implemented,  
 really nicely done stippi :-)

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42349 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/mediaplayer/VideoView.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/apps/mediaplayer/VideoView.cpp b/src/apps/mediaplayer/VideoView.cpp
index 2adf60e8a3..d55a14421d 100644
--- a/src/apps/mediaplayer/VideoView.cpp
+++ b/src/apps/mediaplayer/VideoView.cpp
@@ -442,7 +442,8 @@ VideoView::_LayoutSubtitle()
 	switch (fSubtitlePlacement) {
 		default:
 		case mpSettings::SUBTITLE_PLACEMENT_BOTTOM_OF_VIDEO:
-			offset.y = fVideoFrame.bottom - fSubtitleFrame.Height();
+			offset.y = min_c(fSubtitleMaxButtom, fVideoFrame.bottom)
+				- fSubtitleFrame.Height();
 			break;
 		case mpSettings::SUBTITLE_PLACEMENT_BOTTOM_OF_SCREEN:
 		{