mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 00:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/msgbox

Browse Source
This commit is contained in:
Thilo Graf
2016-11-11 00:51:20 +01:00
parent 43c1349ffa 30f231c801
commit 96ffa4778a
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/epgview.cpp
View File

@@ -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: case CRCInput::RC_left:
if ((prev_id != 0) && !call_fromfollowlist && !mp_info) if ((prev_id != 0) && !call_fromfollowlist && !mp_info)
{ {
toph = topboxheight;
show(channel_id, prev_id, &prev_zeit, false); show(channel_id, prev_id, &prev_zeit, false);
showPos=0; 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: case CRCInput::RC_right:
if ((next_id != 0) && !call_fromfollowlist && !mp_info) if ((next_id != 0) && !call_fromfollowlist && !mp_info)
{ {
toph = topboxheight;
show(channel_id, next_id, &next_zeit, false); show(channel_id, next_id, &next_zeit, false);
showPos=0; showPos=0;
} }

9
src/gui/eventlist.cpp
View File

@@ -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_mid = SNeutrinoSettings::FONT_TYPE_EVENTLIST_TITLE;
int font_lr = SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMLARGE; int font_lr = SNeutrinoSettings::FONT_TYPE_EVENTLIST_ITEMLARGE;
if (!header){ if (!header)
header = new CComponentsFrmChain(x, y, full_width, theight); 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->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->setCorner(RADIUS_LARGE, CORNER_TOP);
}
header->clear(); header->clear();
int x_off = OFFSET_INNER_MID; 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()) { if (!_channelname_next.empty()) {
int name_w = std::min(g_Font[font_lr]->getRenderWidth(_channelname_next), side_width); int x_pos = full_width - side_width - x_off;
int x_pos = full_width - name_w - 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);
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);
rText->doPaintBg(false); rText->doPaintBg(false);
} }

3
src/gui/widget/menue.cpp
View File

@@ -1228,7 +1228,6 @@ void CMenuWidget::initSelectable()
void CMenuWidget::paint() void CMenuWidget::paint()
{ {
OnBeforePaint();
if (header){ if (header){
if ((bool)header->getCornerRadius() != (bool)g_settings.rounded_corners) //ensure reset if corner mode was changed if ((bool)header->getCornerRadius() != (bool)g_settings.rounded_corners) //ensure reset if corner mode was changed
ResetModules(); ResetModules();
@@ -1239,6 +1238,8 @@ void CMenuWidget::paint()
calcSize(); calcSize();
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8 /*, nameString.c_str()*/); CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8 /*, nameString.c_str()*/);
OnBeforePaint();
// paint head // paint head
if (header == NULL){ if (header == NULL){
header = new CComponentsHeader(x, y, width + sb_width, hheight, getName(), iconfile); header = new CComponentsHeader(x, y, width + sb_width, hheight, getName(), iconfile);