diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 9593a4022..02bbb504b 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -991,6 +991,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start case CRCInput::RC_left: if ((prev_id != 0) && !call_fromfollowlist && !mp_info) { + toph = topboxheight; show(channel_id, prev_id, &prev_zeit, false); showPos=0; } @@ -998,6 +999,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start case CRCInput::RC_right: if ((next_id != 0) && !call_fromfollowlist && !mp_info) { + toph = topboxheight; show(channel_id, next_id, &next_zeit, false); showPos=0; } diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index cd7da703b..772827d93 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -848,11 +848,11 @@ void CEventList::paintHead(t_channel_id _channel_id, std::string _channelname, s int font_mid = SNeutrinoSettings::FONT_TYPE_EVENTLIST_TITLE; int font_lr = SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMLARGE; - if (!header){ + if (!header) header = new CComponentsFrmChain(x, y, full_width, theight); - header->enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_MENUCONTENT_PLUS_0, g_settings.theme.menu_Head_gradient_direction); - header->setCorner(RADIUS_LARGE, CORNER_TOP); - } + + header->enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_MENUCONTENT_PLUS_0, g_settings.theme.menu_Head_gradient_direction); + header->setCorner(RADIUS_LARGE, CORNER_TOP); header->clear(); int x_off = OFFSET_INNER_MID; @@ -885,9 +885,8 @@ void CEventList::paintHead(t_channel_id _channel_id, std::string _channelname, s } if (!_channelname_next.empty()) { - int name_w = std::min(g_Font[font_lr]->getRenderWidth(_channelname_next), side_width); - int x_pos = full_width - name_w - x_off; - CComponentsText *rText = new CComponentsText(x_pos, CC_CENTERED, name_w, theight, _channelname_next, CTextBox::NO_AUTO_LINEBREAK, g_Font[font_lr], CComponentsText::FONT_STYLE_REGULAR, header, CC_SHADOW_OFF, COL_MENUHEAD_TEXT); + int x_pos = full_width - side_width - x_off; + CComponentsText *rText = new CComponentsText(x_pos, CC_CENTERED, side_width, theight, _channelname_next, CTextBox::NO_AUTO_LINEBREAK | CTextBox::RIGHT, g_Font[font_lr], CComponentsText::FONT_STYLE_REGULAR, header, CC_SHADOW_OFF, COL_MENUHEAD_TEXT); rText->doPaintBg(false); } diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 74a09d0e7..045703f5a 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -1228,7 +1228,6 @@ void CMenuWidget::initSelectable() void CMenuWidget::paint() { - OnBeforePaint(); if (header){ if ((bool)header->getCornerRadius() != (bool)g_settings.rounded_corners) //ensure reset if corner mode was changed ResetModules(); @@ -1239,6 +1238,8 @@ void CMenuWidget::paint() calcSize(); CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8 /*, nameString.c_str()*/); + OnBeforePaint(); + // paint head if (header == NULL){ header = new CComponentsHeader(x, y, width + sb_width, hheight, getName(), iconfile);