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

Remove unused last arg from paint

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1937 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-12-05 16:41:46 +00:00
parent 400d74abb2
commit 66843bf552
4 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/moviebrowser.cpp
View File

@@ -3446,7 +3446,7 @@ int CMenuSelector::exec(CMenuTarget* /*parent*/)
return menu_return::RETURN_EXIT; return menu_return::RETURN_EXIT;
}; };
int CMenuSelector::paint(bool selected, bool /*last*/) int CMenuSelector::paint(bool selected)
{ {
CFrameBuffer * frameBuffer = CFrameBuffer::getInstance(); CFrameBuffer * frameBuffer = CFrameBuffer::getInstance();

2
src/gui/moviebrowser.h
View File

@@ -439,7 +439,7 @@ class CMenuSelector : public CMenuItem
CMenuSelector(const char * OptionName, const bool Active = true, char * OptionValue = NULL, int* ReturnInt = NULL,int ReturnIntValue = 0); CMenuSelector(const char * OptionName, const bool Active = true, char * OptionValue = NULL, int* ReturnInt = NULL,int ReturnIntValue = 0);
CMenuSelector(const char * OptionName, const bool Active , std::string & OptionValue, int* ReturnInt = NULL,int ReturnIntValue = 0); CMenuSelector(const char * OptionName, const bool Active , std::string & OptionValue, int* ReturnInt = NULL,int ReturnIntValue = 0);
int exec(CMenuTarget* parent); int exec(CMenuTarget* parent);
int paint(bool selected, bool last = 0); int paint(bool selected);
int getHeight(void) const{return height;}; int getHeight(void) const{return height;};
bool isSelectable(void) const { return active;} bool isSelectable(void) const { return active;}
}; };

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

@@ -130,8 +130,6 @@ void CMenuItem::paintItemBackground (const bool select_mode, const int &item_hei
if(select_mode) if(select_mode)
frameBuffer->paintBoxRel(x, y, dx, item_height, item_bgcolor, RADIUS_LARGE); frameBuffer->paintBoxRel(x, y, dx, item_height, item_bgcolor, RADIUS_LARGE);
//else if(last) ?? Why do we need this?
//frameBuffer->paintBoxRel(x, y, dx, item_height, i_bgcolor, RADIUS_LARGE, CORNER_BOTTOM); //FIXME
else else
frameBuffer->paintBoxRel(x, y, dx, item_height, item_bgcolor, RADIUS_LARGE); frameBuffer->paintBoxRel(x, y, dx, item_height, item_bgcolor, RADIUS_LARGE);
} }
@@ -510,7 +508,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
CMenuItem* titem = items[i]; CMenuItem* titem = items[i];
if ((titem->directKey != CRCInput::RC_nokey) && (titem->directKey == msg)) { if ((titem->directKey != CRCInput::RC_nokey) && (titem->directKey == msg)) {
if (titem->isSelectable()) { if (titem->isSelectable()) {
items[selected]->paint( false, (i == items.size()-1) ); items[selected]->paint( false );
selected= i; selected= i;
msg= CRCInput::RC_ok; msg= CRCInput::RC_ok;
} else { } else {
@@ -561,8 +559,8 @@ 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 < (int)page_start[current_page + 1]) && (pos >= (int)page_start[current_page])) {
items[selected]->paint( false, (pos == (int) items.size()-1) ); items[selected]->paint( false );
item->paint( true , (count == items.size()-1)); item->paint( true );
selected = pos; selected = pos;
} else { } else {
selected=pos; selected=pos;
@@ -578,8 +576,8 @@ 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 < (int)page_start[current_page + 1]) && (pos >= (int)page_start[current_page])) {
items[selected]->paint( false, (count == items.size()-1) ); items[selected]->paint( false );
item->paint( true, (count == items.size()-1) ); item->paint( true );
selected = pos; selected = pos;
} else { } else {
selected=pos; selected=pos;
@@ -632,7 +630,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
if ((pos < (int)page_start[current_page + 1]) && (pos >= (int)page_start[current_page])) if ((pos < (int)page_start[current_page + 1]) && (pos >= (int)page_start[current_page]))
{ // Item is currently on screen { // Item is currently on screen
//clear prev. selected //clear prev. selected
items[selected]->paint( false, (selected == (int) (page_start[current_page + 1]-1)) ); items[selected]->paint( false );
//select new //select new
item->paint( true ); item->paint( true );
selected = pos; selected = pos;
@@ -1061,7 +1059,7 @@ int CMenuOptionNumberChooser::exec(CMenuTarget*)
return menu_return::RETURN_NONE; return menu_return::RETURN_NONE;
} }
int CMenuOptionNumberChooser::paint(bool selected, bool /*last*/) int CMenuOptionNumberChooser::paint(bool selected)
{ {
const char * l_option; const char * l_option;
char option_value[11]; char option_value[11];
@@ -1249,7 +1247,7 @@ int CMenuOptionChooser::exec(CMenuTarget*)
return ret; return ret;
} }
int CMenuOptionChooser::paint( bool selected , bool /*last*/) int CMenuOptionChooser::paint( bool selected)
{ {
if(optionName != NONEXISTANT_LOCALE) if(optionName != NONEXISTANT_LOCALE)
optionNameString = g_Locale->getText(optionName); optionNameString = g_Locale->getText(optionName);
@@ -1403,7 +1401,7 @@ int CMenuOptionStringChooser::exec(CMenuTarget* parent)
return ret; return ret;
} }
int CMenuOptionStringChooser::paint( bool selected, bool /*last*/ ) int CMenuOptionStringChooser::paint( bool selected )
{ {
const char * l_optionName = g_Locale->getText(optionName); const char * l_optionName = g_Locale->getText(optionName);
@@ -1468,7 +1466,7 @@ int CMenuOptionLanguageChooser::exec(CMenuTarget*)
return menu_return::RETURN_NONE; return menu_return::RETURN_NONE;
} }
int CMenuOptionLanguageChooser::paint( bool selected, bool /*last*/ ) int CMenuOptionLanguageChooser::paint( bool selected )
{ {
active = true; active = true;
@@ -1589,7 +1587,7 @@ const char * CMenuForwarder::getName(void)
return g_Locale->getText(text); return g_Locale->getText(text);
} }
int CMenuForwarder::paint(bool selected, bool /*last*/) int CMenuForwarder::paint(bool selected)
{ {
int height = getHeight(); int height = getHeight();
const char * l_text = getName(); const char * l_text = getName();
@@ -1684,7 +1682,7 @@ int CMenuSeparator::getWidth(void)
return w; return w;
} }
int CMenuSeparator::paint(bool selected, bool /*last*/) int CMenuSeparator::paint(bool selected)
{ {
int height; int height;
CFrameBuffer * frameBuffer = CFrameBuffer::getInstance(); CFrameBuffer * frameBuffer = CFrameBuffer::getInstance();

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

@@ -106,7 +106,7 @@ class CMenuItem
virtual void init(const int X, const int Y, const int DX, const int OFFX); virtual void init(const int X, const int Y, const int DX, const int OFFX);
virtual int paint (bool selected = false, bool last = false) = 0; virtual int paint (bool selected = false) = 0;
virtual int getHeight(void) const = 0; virtual int getHeight(void) const = 0;
virtual int getWidth(void) virtual int getWidth(void)
{ {
@@ -162,7 +162,7 @@ class CMenuSeparator : public CMenuItem
CMenuSeparator(const int Type = 0, const neutrino_locale_t Text = NONEXISTANT_LOCALE); CMenuSeparator(const int Type = 0, const neutrino_locale_t Text = NONEXISTANT_LOCALE);
virtual ~CMenuSeparator(){} virtual ~CMenuSeparator(){}
int paint(bool selected=false, bool last = false); int paint(bool selected=false);
int getHeight(void) const; int getHeight(void) const;
int getWidth(void); int getWidth(void);
@@ -191,7 +191,7 @@ class CMenuForwarder : public CMenuItem
virtual ~CMenuForwarder(){} virtual ~CMenuForwarder(){}
int paint(bool selected=false, bool last = false); int paint(bool selected=false);
int getHeight(void) const; int getHeight(void) const;
int getWidth(void); int getWidth(void);
void setOption(const char *Option); void setOption(const char *Option);
@@ -262,7 +262,7 @@ private:
public: public:
CMenuOptionNumberChooser(const neutrino_locale_t name, int * const OptionValue, const bool Active, const int min_value, const int max_value, CChangeObserver * const Observ = NULL, const int print_offset = 0, const int special_value = 0, const neutrino_locale_t special_value_name = NONEXISTANT_LOCALE, const char * non_localized_name = NULL, bool sliderOn = false ); CMenuOptionNumberChooser(const neutrino_locale_t name, int * const OptionValue, const bool Active, const int min_value, const int max_value, CChangeObserver * const Observ = NULL, const int print_offset = 0, const int special_value = 0, const neutrino_locale_t special_value_name = NONEXISTANT_LOCALE, const char * non_localized_name = NULL, bool sliderOn = false );
int paint(bool selected, bool last = false); int paint(bool selected);
int exec(CMenuTarget* parent); int exec(CMenuTarget* parent);
int isMenueOptionChooser(void) const{return 1;} int isMenueOptionChooser(void) const{return 1;}
@@ -314,7 +314,7 @@ class CMenuOptionChooser : public CAbstractMenuOptionChooser
int getOptionValue(void) const; int getOptionValue(void) const;
int getWidth(void); int getWidth(void);
int paint(bool selected, bool last = 0); int paint(bool selected);
std::string getOptionName() {return optionNameString;}; std::string getOptionName() {return optionNameString;};
int exec(CMenuTarget* parent); int exec(CMenuTarget* parent);
@@ -336,7 +336,7 @@ class CMenuOptionStringChooser : public CMenuItem
void addOption(const char * value); void addOption(const char * value);
void removeOptions(){options.clear();}; void removeOptions(){options.clear();};
int paint(bool selected, bool last = 0); int paint(bool selected);
int getHeight(void) const int getHeight(void) const
{ {
return height; return height;
@@ -362,7 +362,7 @@ class CMenuOptionLanguageChooser : public CMenuItem
~CMenuOptionLanguageChooser(); ~CMenuOptionLanguageChooser();
void addOption(const char * value); void addOption(const char * value);
int paint(bool selected, bool last = 0); int paint(bool selected);
int getHeight(void) const int getHeight(void) const
{ {
return height; return height;