From 87b72231b61c43dfc46a9b4fa7335749401c91e9 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 26 Jan 2011 11:04:06 +0000 Subject: [PATCH] neutrino menu classes: clean up, only comments removed git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1046 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/0aed74d1ecec98a70daddb850962a20381a33a2d Author: Thilo Graf Date: 2011-01-26 (Wed, 26 Jan 2011) Origin message was: ------------------ *neutrino menu classes: clean up, only comments removed git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1046 e54a6e83-5905-42d5-8d5c-058d10e6a962 ------------------ This commit was generated by Migit --- src/gui/widget/menue.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 20902b994..3dff739ba 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -122,7 +122,7 @@ void CMenuItem::setItemColors(const bool select_mode, const fb_pixel_t &def_col } -void CMenuItem::paintItemBackground (const bool select_mode, /*const int &item_x, const int &item_y, const int &width,*/ const int &height) +void CMenuItem::paintItemBackground (const bool select_mode, const int &height) { CFrameBuffer *frameBuffer = CFrameBuffer::getInstance(); @@ -161,21 +161,21 @@ void CMenuItem::paintItemCaption(const bool select_mode, const int &height, cons } } -void CMenuItem::paintItem(const bool select_mode, /*int &start_x, int &start_y, int &width,*/ int &height) +void CMenuItem::paintItem(const bool select_mode, const int &height) { // //set colors // setItemColors(select_mode); //paint item background - paintItemBackground(select_mode, /*start_x, start_y, width,*/ height); + paintItemBackground(select_mode, height); } -void CMenuItem::paintItemButton(/*const int frame_height, */const bool select_mode, const std::string &icon_Name, const bool icon_centered) +void CMenuItem::paintItemButton(const bool select_mode, const std::string &icon_Name, const bool icon_centered) { CFrameBuffer *frameBuffer = CFrameBuffer::getInstance(); bool selected = select_mode; - int height = getHeight();/*frame_height;*/ + int height = getHeight();/*item_height;*/ bool icon_painted = false; bool centered = icon_centered; @@ -1141,10 +1141,10 @@ int CMenuOptionChooser::paint( bool selected , bool /*last*/) setItemColors(selected); //paint item - paintItem(selected, /*x, y, dx,*/ height); + paintItem(selected, height); //paint item icon - paintItemButton(/*height, */selected, NEUTRINO_ICON_BUTTON_OKAY); + paintItemButton(selected, NEUTRINO_ICON_BUTTON_OKAY); //paint text paintItemCaption(selected, height , optionNameString.c_str(), l_option);