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

menu: make page_start[] int, avoids lots of casts

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: c5760c6a27
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-02 (Sun, 02 Jun 2013)


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

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-06-02 20:31:42 +02:00
parent 93132c0227
commit 35ebdb1943
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -547,11 +547,11 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
case (CRCInput::RC_page_down) : case (CRCInput::RC_page_down) :
if(msg==CRCInput::RC_page_up) { if(msg==CRCInput::RC_page_up) {
if(current_page) { if(current_page) {
pos = (int) page_start[current_page] - 1; pos = page_start[current_page] - 1;
for (unsigned int count=pos ; count > 0; count--) { for (unsigned int count=pos ; count > 0; count--) {
CMenuItem* item = items[pos]; CMenuItem* item = items[pos];
if ( item->isSelectable() ) { if ( item->isSelectable() ) {
if ((pos < (int)page_start[current_page + 1]) && (pos >= (int)page_start[current_page])) { if ((pos < page_start[current_page + 1]) && (pos >= page_start[current_page])) {
items[selected]->paint( false ); items[selected]->paint( false );
item->paint( true ); item->paint( true );
paintHint(pos); paintHint(pos);
@@ -569,7 +569,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
for (unsigned int count=0; count < items.size(); count++) { for (unsigned int count=0; count < items.size(); count++) {
CMenuItem* item = items[pos]; CMenuItem* item = items[pos];
if ( item->isSelectable() ) { if ( item->isSelectable() ) {
if ((pos < (int)page_start[current_page + 1]) && (pos >= (int)page_start[current_page])) { if ((pos < page_start[current_page + 1]) && (pos >= page_start[current_page])) {
items[selected]->paint( false ); items[selected]->paint( false );
item->paint( true ); item->paint( true );
paintHint(pos); paintHint(pos);
@@ -585,13 +585,13 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
} }
} }
else if(msg==CRCInput::RC_page_down) { else if(msg==CRCInput::RC_page_down) {
pos = (int) page_start[current_page + 1];// - 1; pos = page_start[current_page + 1];// - 1;
if(pos >= (int) items.size()) if(pos >= (int) items.size())
pos = items.size()-1; pos = items.size()-1;
for (unsigned int count=pos ; count < items.size(); count++) { for (unsigned int count=pos ; count < items.size(); count++) {
CMenuItem* item = items[pos]; CMenuItem* item = items[pos];
if ( item->isSelectable() ) { if ( item->isSelectable() ) {
if ((pos < (int)page_start[current_page + 1]) && (pos >= (int)page_start[current_page])) { if ((pos < page_start[current_page + 1]) && (pos >= page_start[current_page])) {
items[selected]->paint( false ); items[selected]->paint( false );
item->paint( true ); item->paint( true );
paintHint(pos); paintHint(pos);
@@ -623,7 +623,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
CMenuItem* item = items[pos]; CMenuItem* item = items[pos];
if ( item->isSelectable() ) { if ( item->isSelectable() ) {
if ((pos < (int)page_start[current_page + 1]) && (pos >= (int)page_start[current_page])) if ((pos < page_start[current_page + 1]) && (pos >= page_start[current_page]))
{ // Item is currently on screen { // Item is currently on screen
//clear prev. selected //clear prev. selected
items[selected]->paint( false ); items[selected]->paint( false );
@@ -975,9 +975,9 @@ void CMenuWidget::paintItems()
//Item not currently on screen //Item not currently on screen
if (selected >= 0) if (selected >= 0)
{ {
while(selected < (int)page_start[current_page]) while (selected < page_start[current_page])
current_page--; current_page--;
while(selected >= (int)page_start[current_page + 1]) while (selected >= page_start[current_page + 1])
current_page++; current_page++;
} }
@@ -992,7 +992,7 @@ void CMenuWidget::paintItems()
} }
} }
int ypos=item_start_y; int ypos=item_start_y;
for (unsigned int count = 0; count < items.size(); count++) for (int count = 0; count < (int)items.size(); count++)
{ {
CMenuItem* item = items[count]; CMenuItem* item = items[count];

2
src/gui/widget/menue.h
View File

@@ -432,7 +432,7 @@ class CMenuWidget : public CMenuTarget
neutrino_locale_t name; neutrino_locale_t name;
CFrameBuffer *frameBuffer; CFrameBuffer *frameBuffer;
std::vector<CMenuItem*> items; std::vector<CMenuItem*> items;
std::vector<unsigned int> page_start; std::vector<int> page_start;
std::string iconfile; std::string iconfile;
int min_width; int min_width;