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

Fix CMenuWidget::resetWidget; Fix not needed repaints from CMenuOptionStringChooser; Reset item positions in hide() to prevent paints if hidden

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1930 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-12-02 15:44:51 +00:00
parent f54ce0ede3
commit 07ee1cd155
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -378,6 +378,7 @@ void CMenuWidget::move(int xoff, int yoff)
CMenuWidget::~CMenuWidget() CMenuWidget::~CMenuWidget()
{ {
#if 0
for(unsigned int count=0;count<items.size();count++) { for(unsigned int count=0;count<items.size();count++) {
CMenuItem * item = items[count]; CMenuItem * item = items[count];
if ((item != GenericMenuSeparator) && if ((item != GenericMenuSeparator) &&
@@ -388,6 +389,8 @@ CMenuWidget::~CMenuWidget()
} }
items.clear(); items.clear();
page_start.clear(); page_start.clear();
#endif
resetWidget();
} }
void CMenuWidget::addItem(CMenuItem* menuItem, const bool defaultselected) void CMenuWidget::addItem(CMenuItem* menuItem, const bool defaultselected)
@@ -409,6 +412,14 @@ void CMenuWidget::addItem(CMenuItem* menuItem, const bool defaultselected)
void CMenuWidget::resetWidget() void CMenuWidget::resetWidget()
{ {
for(unsigned int count=0;count<items.size();count++) {
CMenuItem * item = items[count];
if ((item != GenericMenuSeparator) &&
(item != GenericMenuSeparatorLine) &&
(item != GenericMenuBack) &&
(item != GenericMenuCancel))
delete item;
}
items.clear(); items.clear();
page_start.clear(); page_start.clear();
selected=-1; selected=-1;
@@ -754,9 +765,10 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
items[count] = GenericMenuBack; items[count] = GenericMenuBack;
else if (items[count] == GenericMenuCancel) else if (items[count] == GenericMenuCancel)
items[count] = GenericMenuBack; items[count] = GenericMenuBack;
#if 0 // done in hide
CMenuItem* item = items[count]; CMenuItem* item = items[count];
item->init(-1, 0, 0, 0); item->init(-1, 0, 0, 0);
#endif
} }
if (widget_index > -1) if (widget_index > -1)
@@ -769,6 +781,9 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
void CMenuWidget::hide() void CMenuWidget::hide()
{ {
frameBuffer->paintBackgroundBoxRel(x, y, width+15+SHADOW_OFFSET,height+10+SHADOW_OFFSET); frameBuffer->paintBackgroundBoxRel(x, y, width+15+SHADOW_OFFSET,height+10+SHADOW_OFFSET);
/* setActive() paints item for hidden parent menu, if called from child menu */
for (unsigned int count = 0; count < items.size(); count++)
items[count]->init(-1, 0, 0, 0);
} }
void CMenuWidget::paint() void CMenuWidget::paint()
@@ -1308,13 +1323,13 @@ int CMenuOptionStringChooser::exec(CMenuTarget* parent)
bool wantsRepaint = false; bool wantsRepaint = false;
int ret = menu_return::RETURN_NONE; int ret = menu_return::RETURN_NONE;
if (parent)
parent->hide();
if((!parent || msg == CRCInput::RC_ok) && pulldown) { if((!parent || msg == CRCInput::RC_ok) && pulldown) {
int select = -1; int select = -1;
char cnt[5]; char cnt[5];
if (parent)
parent->hide();
CMenuWidget* menu = new CMenuWidget(optionName, NEUTRINO_ICON_SETTINGS); CMenuWidget* menu = new CMenuWidget(optionName, NEUTRINO_ICON_SETTINGS);
menu->addIntroItems(); menu->addIntroItems();
//if(parent) menu->move(20, 0); //if(parent) menu->move(20, 0);
@@ -1346,14 +1361,13 @@ int CMenuOptionStringChooser::exec(CMenuTarget* parent)
strcpy(optionValue, options[options.size() - 1].c_str()); strcpy(optionValue, options[options.size() - 1].c_str());
} else } else
strcpy(optionValue, options[(count + 1) % options.size()].c_str()); strcpy(optionValue, options[(count + 1) % options.size()].c_str());
wantsRepaint = true; //wantsRepaint = true;
break; break;
} }
} }
}
if(parent)
paint(true); paint(true);
}
if(observ) { if(observ) {
wantsRepaint = observ->changeNotify(optionName, optionValue); wantsRepaint = observ->changeNotify(optionName, optionValue);
} }
@@ -1372,7 +1386,7 @@ int CMenuOptionStringChooser::paint( bool selected, bool /*last*/ )
//paint item icon //paint item icon
paintItemButton(selected, height, 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);