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 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d271a8999b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-11 00:51:58 +01:00
parent 87990f548e cd019ed4c1
commit 584a34c2a7
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/eventlist.cpp
View File

@@ -857,8 +857,9 @@ void CEventList::paintHead(t_channel_id _channel_id, std::string _channelname, s
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();
header->setDimensionsAll(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();

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

@@ -1246,7 +1246,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();
@@ -1257,6 +1256,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);