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

fix my last commit 0064c6c (recalc height)

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 39f16c7dc3
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-17 (Sun, 17 Mar 2013)

Origin message was:
------------------
- fix my last commit 0064c6c (recalc height)

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2013-03-17 20:15:17 +01:00
committed by [CST] Focus
parent e6a89d7bec
commit 0df9b800da
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/channellist.cpp
View File

@@ -497,11 +497,10 @@ void CChannelList::calcSize()
info_height = 2*fheight + g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->getHeight() + 10; info_height = 2*fheight + g_Font[SNeutrinoSettings::FONT_TYPE_CHANNELLIST_DESCR]->getHeight() + 10;
height = h_max ((frameBuffer->getScreenHeight() / 20 * 18) - info_height, 0); height = h_max ((frameBuffer->getScreenHeight() / 20 * 18) - info_height, 0);
// calculate x/y positions // calculate x position
x = getScreenStartX(full_width); x = getScreenStartX(full_width);
if (x < ConnectLineBox_Width) if (x < ConnectLineBox_Width)
x = ConnectLineBox_Width; x = ConnectLineBox_Width;
y = getScreenStartY(height + info_height);
// calculate header height // calculate header height
const int pic_h = 39; const int pic_h = 39;
@@ -523,6 +522,12 @@ void CChannelList::calcSize()
// calculate max entrys in mainbox // calculate max entrys in mainbox
listmaxshow = (height - theight - footerHeight) / fheight; listmaxshow = (height - theight - footerHeight) / fheight;
// recalculate height to avoid spaces between last entry in mainbox and footer
height = theight + listmaxshow*fheight + footerHeight;
// calculate y position
y = getScreenStartY(height + info_height);
// calculate width/height of right info_zone and pip-box // calculate width/height of right info_zone and pip-box
infozone_width = full_width - width; infozone_width = full_width - width;
pig_width = infozone_width; pig_width = infozone_width;