- osd_setup: introduce g_settings.window_size to scale some windows

* remove g_settings.big_windows
* add setup window (use up/down to change size)
This commit is contained in:
svenhoefer
2013-09-02 20:59:26 +02:00
parent b8ec3b55e6
commit 6ed30528f9
10 changed files with 112 additions and 36 deletions

View File

@@ -457,24 +457,16 @@ unsigned int CFrameBuffer::getScreenHeight(bool real)
return g_settings.screen_EndY - g_settings.screen_StartY;
}
unsigned int CFrameBuffer::getScreenPercentRel(bool force_small)
{
int percent = 100;
if (force_small || !g_settings.big_windows)
percent = NON_BIG_WINDOWS;
return percent;
}
unsigned int CFrameBuffer::getScreenWidthRel(bool force_small)
{
int percent = getScreenPercentRel(force_small);
int percent = force_small ? WINDOW_SIZE_MIN : g_settings.window_size;
// 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 = getScreenPercentRel(force_small);
int percent = force_small ? WINDOW_SIZE_MIN : g_settings.window_size;
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_STEP 5
#define FADE_RESET 0xFFFF
#define NON_BIG_WINDOWS 85 // %
#define WINDOW_SIZE_MAX 100 // %
#define WINDOW_SIZE_MIN 80 // %
#define ConnectLineBox_Width 16 // px
/** Ausfuehrung als Singleton */
@@ -157,7 +158,6 @@ class CFrameBuffer
unsigned int getStride() const; // size of a single line in the framebuffer (in bytes)
unsigned int getScreenWidth(bool real = false);
unsigned int getScreenHeight(bool real = false);
unsigned int getScreenPercentRel(bool force_small);
unsigned int getScreenWidthRel(bool force_small = false);
unsigned int getScreenHeightRel(bool force_small = false);
unsigned int getScreenX();