Author: axeld Date: 2011-07-01 01:00:38 +0200 (Fri, 01 Jul 2011) New Revision: 42349 Changeset: https://dev.haiku-os.org/changeset/42349 Modified: haiku/trunk/src/apps/mediaplayer/VideoView.cpp Log: * 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 :-) Modified: haiku/trunk/src/apps/mediaplayer/VideoView.cpp =================================================================== --- haiku/trunk/src/apps/mediaplayer/VideoView.cpp 2011-06-30 22:30:48 UTC (rev 42348) +++ haiku/trunk/src/apps/mediaplayer/VideoView.cpp 2011-06-30 23:00:38 UTC (rev 42349) @@ -442,7 +442,8 @@ 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: {