framebuffer-ng: port commit 1640aeae to fix window sizes

Origin commit data
------------------
Branch: ni/coolstream
Commit: e508ba1fe8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-15 (Fri, 15 Nov 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-11-15 11:57:32 +01:00
parent 58690ec785
commit 16d2e72369
2 changed files with 4 additions and 3 deletions

View File

@@ -305,14 +305,14 @@ unsigned int CFrameBuffer::getScreenHeight(bool real)
unsigned int CFrameBuffer::getScreenWidthRel(bool force_small)
{
int percent = force_small ? WINDOW_SIZE_MIN : g_settings.window_size;
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;
}
unsigned int CFrameBuffer::getScreenHeightRel(bool force_small)
{
int percent = force_small ? WINDOW_SIZE_MIN : g_settings.window_size;
int percent = force_small ? WINDOW_SIZE_MIN_FORCED : g_settings.window_height;
return (g_settings.screen_EndY - g_settings.screen_StartY) * percent / 100;
}

View File

@@ -54,7 +54,8 @@ typedef struct fb_var_screeninfo t_fb_var_screeninfo;
#define FADE_RESET 0xFFFF
#define WINDOW_SIZE_MAX 100 // %
#define WINDOW_SIZE_MIN 80 // %
#define WINDOW_SIZE_MIN 50 // %
#define WINDOW_SIZE_MIN_FORCED 80 // %
#define ConnectLineBox_Width 16 // px
#if HAVE_GENERIC_HARDWARE