The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-11-23 19:59:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

-fixed the memory leaks of the source menu images

Browse Source
This commit is contained in:
fix94.1 2012-11-30 20:54:02 +00:00
parent 098b5c342b
commit c06ff6877f
3 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source/gui/gui.cpp
View File

@ -526,15 +526,26 @@ void CButtonsMgr::setText(s16 id, const wstringEx &text, u32 startline,bool unwr
void CButtonsMgr::setBtnTexture(s16 id, STexture &texNormal, STexture &texSelected) void CButtonsMgr::setBtnTexture(s16 id, STexture &texNormal, STexture &texSelected)
{ {
if (id == -1) return; if (id == -1) return;
SButtonTextureSet texSet;
texSet.center = texNormal;
texSet.centerSel = texSelected;
if (id < (s32)m_elts.size()) if (id < (s32)m_elts.size())
{ {
SButton *b = (SButton*)m_elts[id]; SButton *b = (SButton*)m_elts[id];
b->tex = texSet;//change texture /* free old textures */
b->tex.center.Cleanup();
b->tex.centerSel.Cleanup();
/*change textures */
b->tex.center = texNormal;
b->tex.centerSel = texSelected;
}
}
void CButtonsMgr::freeBtnTexture(s16 id)
{
if(id == -1) return;
if(id < (s32)m_elts.size())
{
SButton *b = (SButton*)m_elts[id];
b->tex.center.Cleanup();
b->tex.centerSel.Cleanup();
} }
} }

1
source/gui/gui.hpp
View File

@ -40,6 +40,7 @@ public:
void setText(s16 id, const wstringEx &text, bool unwrap = false); void setText(s16 id, const wstringEx &text, bool unwrap = false);
void setText(s16 id, const wstringEx &text, u32 startline, bool unwrap = false); void setText(s16 id, const wstringEx &text, u32 startline, bool unwrap = false);
void setBtnTexture(s16 id, STexture &texNormal, STexture &texSelected); void setBtnTexture(s16 id, STexture &texNormal, STexture &texSelected);
void freeBtnTexture(s16 id);
void setTexture(s16 id ,STexture &bg); void setTexture(s16 id ,STexture &bg);
void setTexture(s16 id, STexture &bg, int width, int height); void setTexture(s16 id, STexture &bg, int width, int height);
void setProgress(s16 id, float f, bool instant = false); void setProgress(s16 id, float f, bool instant = false);

23
source/menu/menu_source.cpp
View File

@ -60,7 +60,10 @@ void CMenu::_hideSource(bool instant)
} }
for(i = 0; i < 12; ++i) for(i = 0; i < 12; ++i)
{
m_btnMgr.hide(m_sourceBtnSource[i], instant); m_btnMgr.hide(m_sourceBtnSource[i], instant);
m_btnMgr.freeBtnTexture(m_sourceBtnSource[i]);
}
} }
void CMenu::_showSource(void) void CMenu::_showSource(void)
@ -100,30 +103,30 @@ void CMenu::_updateSourceBtns(void)
for (u8 i = 0; i < 12; ++i) for (u8 i = 0; i < 12; ++i)
m_btnMgr.hide(m_sourceBtnSource[i], true); m_btnMgr.hide(m_sourceBtnSource[i], true);
string ImgName; const char *ImgName = NULL;
u8 j = (Source_curPage - 1) * 12; u8 j = (Source_curPage - 1) * 12;
for(u8 i = 0; i < 12; ++i) for(u8 i = 0; i < 12; ++i)
{ {
STexture texConsoleImg; STexture texConsoleImg;
STexture texConsoleImgs; STexture texConsoleImgs;
ImgName = m_source.getString(fmt("BUTTON_%i", i + j),"image", ""); ImgName = m_source.getString(fmt("BUTTON_%i", i + j),"image", "").c_str();
if(texConsoleImg.fromImageFile(fmt("%s/%s", m_themeDataDir.c_str(), ImgName.c_str())) != TE_OK) if(texConsoleImg.fromImageFile(fmt("%s/%s", m_themeDataDir.c_str(), ImgName)) != TE_OK)
{ {
if(texConsoleImg.fromImageFile(fmt("%s/%s", m_sourceDir.c_str(), ImgName.c_str())) != TE_OK) if(texConsoleImg.fromImageFile(fmt("%s/%s", m_sourceDir.c_str(), ImgName)) != TE_OK)
texConsoleImg.fromPNG(favoriteson_png); texConsoleImg.fromPNG(favoriteson_png);
} }
ImgName = m_source.getString(fmt("BUTTON_%i", i + j),"image_s", ""); ImgName = m_source.getString(fmt("BUTTON_%i", i + j),"image_s", "").c_str();
if(texConsoleImgs.fromImageFile(fmt("%s/%s", m_themeDataDir.c_str(), ImgName.c_str())) != TE_OK) if(texConsoleImgs.fromImageFile(fmt("%s/%s", m_themeDataDir.c_str(), ImgName)) != TE_OK)
{ {
if(texConsoleImgs.fromImageFile(fmt("%s/%s", m_sourceDir.c_str(), ImgName.c_str())) != TE_OK) if(texConsoleImgs.fromImageFile(fmt("%s/%s", m_sourceDir.c_str(), ImgName)) != TE_OK)
texConsoleImgs.fromPNG(favoritesons_png); texConsoleImgs.fromPNG(favoritesons_png);
} }
m_btnMgr.setBtnTexture(m_sourceBtnSource[i], texConsoleImg, texConsoleImgs); m_btnMgr.setBtnTexture(m_sourceBtnSource[i], texConsoleImg, texConsoleImgs);
string source = m_source.getString(fmt("BUTTON_%i", i + j), "source", ""); const char *source = m_source.getString(fmt("BUTTON_%i", i + j), "source", "").c_str();
if (!source.empty()) if(source != NULL && source[0] != '\0')
m_btnMgr.show(m_sourceBtnSource[i]); m_btnMgr.show(m_sourceBtnSource[i]);
} }
} }