Merge branch 'master' into pu/fb-setmode

Origin commit data
------------------
Branch: ni/coolstream
Commit: 2677543cc4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-03-13 21:55:50 +01:00
21 changed files with 60 additions and 60 deletions

View File

@@ -276,8 +276,8 @@ unsigned int CFrameBuffer::getScreenHeight(bool real)
unsigned int CFrameBuffer::getScreenWidthRel(bool force_small)
{
int percent = force_small ? WINDOW_SIZE_MIN_FORCED : g_settings.window_width;
// always reduce a possible detailline
return (g_settings.screen_EndX - g_settings.screen_StartX - 2*ConnectLineBox_Width) * percent / 100;
// always reduce a possible detailsline
return (g_settings.screen_EndX - g_settings.screen_StartX - 2*DETAILSLINE_WIDTH) * percent / 100;
}
unsigned int CFrameBuffer::getScreenHeightRel(bool force_small)