From 16d2e72369b7486d462c11cfe6d56c9c17a22996 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Fri, 15 Nov 2013 11:57:32 +0100 Subject: [PATCH] framebuffer-ng: port commit 1640aeae to fix window sizes Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/e508ba1fe87aa1379adc97613852e483f87355e3 Author: Stefan Seyfried Date: 2013-11-15 (Fri, 15 Nov 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/framebuffer_ng.cpp | 4 ++-- src/driver/framebuffer_ng.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/driver/framebuffer_ng.cpp b/src/driver/framebuffer_ng.cpp index 5c5a382a5..5ce43e2f5 100644 --- a/src/driver/framebuffer_ng.cpp +++ b/src/driver/framebuffer_ng.cpp @@ -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; } diff --git a/src/driver/framebuffer_ng.h b/src/driver/framebuffer_ng.h index 5346aa248..194c25345 100644 --- a/src/driver/framebuffer_ng.h +++ b/src/driver/framebuffer_ng.h @@ -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