From 377761ce52dbd07cc4459de1ef53ccbaea35e5de Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Tue, 3 Sep 2013 10:07:15 +0200 Subject: [PATCH] port g_settings.window_size to framebuffer_ng --- src/driver/framebuffer_ng.cpp | 12 ++---------- src/driver/framebuffer_ng.h | 4 ++-- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/driver/framebuffer_ng.cpp b/src/driver/framebuffer_ng.cpp index ff3d38559..2f34cc485 100644 --- a/src/driver/framebuffer_ng.cpp +++ b/src/driver/framebuffer_ng.cpp @@ -356,24 +356,16 @@ unsigned int CFrameBuffer::getScreenHeight(bool real) return g_settings.screen_EndY - g_settings.screen_StartY; } - -unsigned int CFrameBuffer::getScreenPercentRel(bool force_small) -{ - if (force_small || !g_settings.big_windows) - return NON_BIG_WINDOWS; - return 100; -} - 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; } diff --git a/src/driver/framebuffer_ng.h b/src/driver/framebuffer_ng.h index e7e78d91f..b01d04148 100644 --- a/src/driver/framebuffer_ng.h +++ b/src/driver/framebuffer_ng.h @@ -59,7 +59,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 #if HAVE_GENERIC_HARDWARE @@ -191,7 +192,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();