mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'uncool/dvbsi++' commit c6136d612f

Browse Source 
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-12-30 21:35:20 +01:00
parent d7219efd37 d57e57367f
commit a07b5d6289
84 changed files with 898 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -562,6 +562,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
if ((pos < (int)page_start[current_page + 1]) && (pos >= (int)page_start[current_page])) {
items[selected]->paint( false );
item->paint( true );
paintHint(pos);
selected = pos;
} else {
selected=pos;
@@ -579,6 +580,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
if ((pos < (int)page_start[current_page + 1]) && (pos >= (int)page_start[current_page])) {
items[selected]->paint( false );
item->paint( true );
paintHint(pos);
selected = pos;
} else {
selected=pos;
@@ -1151,6 +1153,7 @@ void CMenuWidget::paintHint(int pos)
details_line->setYPos(ypos1a);
details_line->setYPosDown(ypos2a);
details_line->setHMarkDown(markh);
details_line->setColor(COL_MENUCONTENT_PLUS_6, COL_MENUCONTENTDARK_PLUS_0);
}
details_line->paint(savescreen);
@@ -1160,6 +1163,7 @@ void CMenuWidget::paintHint(int pos)
info_box->setXPos(x);
info_box->setYPos(ypos2);
info_box->setWidth(iwidth);
info_box->setColor(COL_MENUCONTENT_PLUS_6, COL_MENUCONTENTDARK_PLUS_0, COL_MENUCONTENTDARK_PLUS_0);
}
/* force full paint - menu-over i.e. option chooser with pulldown can overwrite */
info_box->paint(savescreen, true);