fixed bug in diplaying list of search timers

This commit is contained in:
louis 2014-01-27 19:14:43 +01:00
parent 5eabb6e7c8
commit 26f46355f9
2 changed files with 5 additions and 4 deletions

View File

@ -153,7 +153,7 @@ void cRecMenu::AddMenuItem(cRecMenuItem *item, bool inFront) {
bool cRecMenu::AddMenuItemInitial(cRecMenuItem *item, bool inFront) {
currentHeight += item->GetHeight();
int totalHeight = headerHeight + footerHeight + currentHeight + 2*border;
if (totalHeight >= geoManager.osdHeight) {
if (totalHeight >= geoManager.osdHeight - 10) {
scrollable = true;
currentHeight -= item->GetHeight();
if (deleteMenuItems) {

View File

@ -654,10 +654,10 @@ cRecMenuSearchTimers::cRecMenuSearchTimers(std::vector<cTVGuideSearchTimer> sear
cRecMenuItemInfo *infoItem = new cRecMenuItemInfo(*headline, true);
infoItem->CalculateHeight(width - 2 * border);
SetHeader(infoItem);
if (numSearchTimers > 0)
SetMenuItems();
cRecMenuItem *button = new cRecMenuItemButton(tr("Close"), rmsClose, (!numSearchTimers)?true:false);
SetFooter(button);
if (numSearchTimers > 0)
SetMenuItems();
CalculateHeight();
CreatePixmap();
Arrange();
@ -669,7 +669,8 @@ cRecMenuSearchTimers::~cRecMenuSearchTimers(void) {
void cRecMenuSearchTimers::SetMenuItems(void) {
for (int i = 0; i < numSearchTimers; i++) {
AddMenuItemInitial(new cRecMenuItemSearchTimer(searchTimers[i], rmsSearchTimerEdit, rmsSearchTimerDeleteConfirm, rmsSearchTimerTest, (i==0)?true:false));
if (!AddMenuItemInitial(new cRecMenuItemSearchTimer(searchTimers[i], rmsSearchTimerEdit, rmsSearchTimerDeleteConfirm, rmsSearchTimerTest, (i==0)?true:false)))
break;
}
}