From 0cfa98486a2ffa9bd7f9061841a31233d9f23005 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 26 Feb 2014 17:57:12 +0100 Subject: [PATCH] CMenuItem: remove redundant member for background paint It seems this method came with more functionality in past, but it's currently not required in that Form. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8a39f01a79900aed1227517bbd44d18e0c979ede Author: Thilo Graf Date: 2014-02-26 (Wed, 26 Feb 2014) ------------------ This commit was generated by Migit --- src/gui/widget/menue.cpp | 12 +----------- src/gui/widget/menue.h | 2 -- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index debbbaed7..c68ceae61 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -138,16 +138,6 @@ void CMenuItem::initItemColors(const bool select_mode) } } -void CMenuItem::paintItemBackground (const bool select_mode, const int &item_height) -{ - CFrameBuffer *frameBuffer = CFrameBuffer::getInstance(); - //FIXME what select_mode change here ?? - if(select_mode) - frameBuffer->paintBoxRel(x, y, dx, item_height, item_bgcolor, RADIUS_LARGE); - else - frameBuffer->paintBoxRel(x, y, dx, item_height, item_bgcolor, RADIUS_LARGE); -} - void CMenuItem::paintItemCaption(const bool select_mode, const int &item_height, const char * left_text, const char * right_text, const fb_pixel_t right_bgcol) { if (select_mode) @@ -209,7 +199,7 @@ void CMenuItem::prepareItem(const bool select_mode, const int &item_height) initItemColors(select_mode); //paint item background - paintItemBackground(select_mode, item_height); + CFrameBuffer::getInstance()->paintBoxRel(x, y, dx, item_height, item_bgcolor, RADIUS_LARGE); } void CMenuItem::paintItemSlider( const bool select_mode, const int &item_height, const int &optionvalue, const int &factor, const char * left_text, const char * right_text) diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index aa286d8da..4208490f1 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -162,8 +162,6 @@ class CMenuItem virtual void paintItemButton(const bool select_mode, const int &item_height, const std::string& icon_Name = NEUTRINO_ICON_BUTTON_RIGHT); - virtual void paintItemBackground (const bool select_mode, const int &item_height); - virtual void prepareItem(const bool select_mode, const int &item_height); virtual void setItemButton(const std::string& icon_Name, const bool is_select_button = false);