mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
This commit is contained in:
vanhofen
2017-03-13 12:45:30 +01:00
parent 8c65bc5cf0 9c009ade29
commit 30fd965086
21 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/fb_generic.cpp
View File

@@ -281,8 +281,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)