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

*neutrino menu classes: item height arg inserted into paintItemButton()

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1048 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
thilo
2011-01-26 11:04:15 +00:00
parent 1df6ed349e
commit d1baf2950a
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,11 +171,10 @@ void CMenuItem::paintItem(const bool select_mode, const int &item_height)
} }
void CMenuItem::paintItemButton(const bool select_mode, const std::string &icon_Name, const bool icon_centered) void CMenuItem::paintItemButton(const bool select_mode, const int &item_height, const std::string &icon_Name, const bool icon_centered)
{ {
CFrameBuffer *frameBuffer = CFrameBuffer::getInstance(); CFrameBuffer *frameBuffer = CFrameBuffer::getInstance();
bool selected = select_mode; bool selected = select_mode;
int item_height = getHeight();/*item_height;*/
bool icon_painted = false; bool icon_painted = false;
bool centered = icon_centered; bool centered = icon_centered;
@@ -940,7 +939,7 @@ int CMenuOptionNumberChooser::paint(bool selected, bool /*last*/)
paintItem(selected, height); paintItem(selected, height);
//paint item icon //paint item icon
paintItemButton(selected, NEUTRINO_ICON_BUTTON_OKAY); paintItemButton(selected, height, NEUTRINO_ICON_BUTTON_OKAY);
//paint text //paint text
paintItemCaption(selected, height , l_optionName, l_option); paintItemCaption(selected, height , l_optionName, l_option);
@@ -1144,7 +1143,7 @@ int CMenuOptionChooser::paint( bool selected , bool /*last*/)
paintItem(selected, height); paintItem(selected, height);
//paint item icon //paint item icon
paintItemButton(selected, NEUTRINO_ICON_BUTTON_OKAY); paintItemButton(selected, height, NEUTRINO_ICON_BUTTON_OKAY);
//paint text //paint text
paintItemCaption(selected, height , optionNameString.c_str(), l_option); paintItemCaption(selected, height , optionNameString.c_str(), l_option);
@@ -1272,7 +1271,7 @@ int CMenuOptionStringChooser::paint( bool selected, bool /*last*/ )
paintItem(selected, height); paintItem(selected, height);
//paint item icon //paint item icon
paintItemButton(selected, NEUTRINO_ICON_BUTTON_OKAY); paintItemButton(selected, height, NEUTRINO_ICON_BUTTON_OKAY);
//paint text //paint text
paintItemCaption(selected, height , l_optionName, optionValue); paintItemCaption(selected, height , l_optionName, optionValue);
@@ -1339,7 +1338,7 @@ int CMenuOptionLanguageChooser::paint( bool selected, bool /*last*/ )
//paint item //paint item
paintItem(selected, height); paintItem(selected, height);
paintItemButton( selected, iconName, true); paintItemButton(selected, height, iconName, true);
//convert first letter to large //convert first letter to large
string s_optionValue = static_cast<std::string> (optionValue); string s_optionValue = static_cast<std::string> (optionValue);
@@ -1465,7 +1464,7 @@ int CMenuForwarder::paint(bool selected, bool /*last*/)
paintItem(selected, height); paintItem(selected, height);
//paint icon //paint icon
paintItemButton(selected); paintItemButton(selected, height);
//caption //caption
paintItemCaption(selected, height, l_text, option_text); paintItemCaption(selected, height, l_text, option_text);

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

@@ -122,7 +122,7 @@ class CMenuItem
} }
virtual void setActive(const bool Active); virtual void setActive(const bool Active);
virtual void paintItemButton(const bool select_mode, const std::string& icon_Name = NEUTRINO_ICON_BUTTON_RIGHT, const bool icon_centered = false); virtual void paintItemButton(const bool select_mode, const int &item_height, const std::string& icon_Name = NEUTRINO_ICON_BUTTON_RIGHT, const bool icon_centered = false);
virtual void setItemColors(const bool select_mode , const fb_pixel_t &def_color = COL_MENUCONTENT, const fb_pixel_t &def_bgcolor = COL_MENUCONTENT_PLUS_0, virtual void setItemColors(const bool select_mode , const fb_pixel_t &def_color = COL_MENUCONTENT, const fb_pixel_t &def_bgcolor = COL_MENUCONTENT_PLUS_0,
const fb_pixel_t &def_sel_color = COL_MENUCONTENTSELECTED, const fb_pixel_t &def_sel_bgcolor = COL_MENUCONTENTSELECTED_PLUS_0, const fb_pixel_t &def_sel_color = COL_MENUCONTENTSELECTED, const fb_pixel_t &def_sel_bgcolor = COL_MENUCONTENTSELECTED_PLUS_0,