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

At least keychooser display was broken with overloaded paint, revert and use double calcSize for now

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2007 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-12-27 16:22:36 +00:00
parent b9b76fcd4c
commit 1242dd2d00
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -479,7 +479,11 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
} }
} }
} }
paint(true); if(savescreen) {
calcSize();
saveScreen();
}
paint();
int retval = menu_return::RETURN_REPAINT; int retval = menu_return::RETURN_REPAINT;
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]); uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
@@ -814,12 +818,13 @@ void CMenuWidget::calcSize()
setMenuPos(width - sb_width); setMenuPos(width - sb_width);
} }
void CMenuWidget::paint(bool save) void CMenuWidget::paint()
{ {
calcSize(); calcSize();
#if 0
if(save) if(save)
saveScreen(); saveScreen();
#endif
CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, nameString.c_str()); CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, nameString.c_str());
//paint shadow and backround //paint shadow and backround

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

@@ -452,7 +452,7 @@ class CMenuWidget : public CMenuTarget
int getItemId(CMenuItem* menuItem); int getItemId(CMenuItem* menuItem);
int getItemsCount(){return items.size();}; int getItemsCount(){return items.size();};
CMenuItem* getItem(const uint& item_id); CMenuItem* getItem(const uint& item_id);
virtual void paint(bool save = false); virtual void paint();
virtual void hide(); virtual void hide();
virtual int exec(CMenuTarget* parent, const std::string & actionKey); virtual int exec(CMenuTarget* parent, const std::string & actionKey);
virtual std::string getName(); virtual std::string getName();