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 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d1316417a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-17 (Wed, 17 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-17 21:38:03 +02:00
parent d859151274 59d3c49084
commit c743021398
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/components/cc_frm_header.cpp
View File

@@ -395,7 +395,7 @@ void CComponentsHeader::initClock()
//set clock form properties //set clock form properties
if (cch_cl_obj){ if (cch_cl_obj){
cch_cl_obj->setYPos(cch_items_y); cch_cl_obj->setYPos(cch_items_y);
cch_cl_obj->setHeight(height); cch_cl_obj->setHeight(height - 1); //NI
//disallow paint of clock, if disabled and exit method //disallow paint of clock, if disabled and exit method
if (!cch_cl_enable){ if (!cch_cl_enable){

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

@@ -1262,14 +1262,13 @@ void CMenuWidget::paint()
header->setOffset(10); header->setOffset(10);
} }
header->setColorBody(COL_MENUHEAD_PLUS_0); header->setColorBody(COL_MENUHEAD_PLUS_0);
header->setColorShadow(COL_MENUCONTENTDARK_PLUS_0);
header->setCaptionColor(COL_MENUHEAD_TEXT); header->setCaptionColor(COL_MENUHEAD_TEXT);
header->enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_MENUCONTENT_PLUS_0); header->enableColBodyGradient(g_settings.theme.menu_Head_gradient, COL_MENUCONTENT_PLUS_0);
header->enableGradientBgCleanUp(savescreen); header->enableGradientBgCleanUp(savescreen);
header->paint(CC_SAVE_SCREEN_NO); header->paint(CC_SAVE_SCREEN_NO);
// paint body shadow // paint body shadow
frameBuffer->paintBoxRel(x+SHADOW_OFFSET, y + hheight + SHADOW_OFFSET, width + sb_width, height - hheight + RADIUS_LARGE + (fbutton_count ? fbutton_height : 0), COL_MENUCONTENTDARK_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM); frameBuffer->paintBoxRel(x+SHADOW_OFFSET, y + hheight + SHADOW_OFFSET, width + sb_width, height - hheight + RADIUS_LARGE + (fbutton_count ? fbutton_height : 0), COL_SHADOW_PLUS_0, RADIUS_LARGE, CORNER_BOTTOM);
// paint body background // paint body background
frameBuffer->paintBoxRel(x, y+hheight, width + sb_width, height-hheight + RADIUS_LARGE, COL_MENUCONTENT_PLUS_0, RADIUS_LARGE, (fbutton_count ? CORNER_NONE : CORNER_BOTTOM)); frameBuffer->paintBoxRel(x, y+hheight, width + sb_width, height-hheight + RADIUS_LARGE, COL_MENUCONTENT_PLUS_0, RADIUS_LARGE, (fbutton_count ? CORNER_NONE : CORNER_BOTTOM));
@@ -1447,6 +1446,7 @@ void CMenuWidget::paintHint(int pos)
/* clear info box */ /* clear info box */
if ((info_box) && (pos < 0)) if ((info_box) && (pos < 0))
savescreen ? info_box->hide() : info_box->kill(); savescreen ? info_box->hide() : info_box->kill();
if (info_box)
hint_painted = info_box->isPainted(); hint_painted = info_box->isPainted();
} }
if (pos < 0) if (pos < 0)
@@ -1499,7 +1499,7 @@ void CMenuWidget::paintHint(int pos)
//NI info_box->removeLineBreaks(str); //NI info_box->removeLineBreaks(str);
info_box->setText(str, CTextBox::AUTO_WIDTH, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT], COL_MENUCONTENT_TEXT); info_box->setText(str, CTextBox::AUTO_WIDTH, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_HINT], COL_MENUCONTENT_TEXT);
info_box->setCorner(RADIUS_LARGE); info_box->setCorner(RADIUS_LARGE);
info_box->setColorAll(COL_MENUCONTENT_PLUS_6, COL_MENUCONTENTDARK_PLUS_0, COL_MENUCONTENTDARK_PLUS_0); info_box->setColorAll(COL_MENUCONTENT_PLUS_6, COL_MENUCONTENTDARK_PLUS_0);
info_box->setColorBody(COL_MENUCONTENT_PLUS_0); //NI info_box->setColorBody(COL_MENUCONTENT_PLUS_0); //NI
info_box->enableShadow(); info_box->enableShadow();
info_box->setPicture(item->hintIcon ? item->hintIcon : ""); info_box->setPicture(item->hintIcon ? item->hintIcon : "");