The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-11-30 15:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

- a little more OCD and cleanup.

Browse Source
This commit is contained in:
Fledge68 2022-07-14 16:48:12 -05:00
parent a17c2b7f9d
commit 23874285c2
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/menu/menu.hpp
View File

@ -192,7 +192,6 @@ private:
TexData m_gameinfoBg; TexData m_gameinfoBg;
TexData m_codeBg; TexData m_codeBg;
TexData m_aboutBg; TexData m_aboutBg;
TexData m_systemBg;
TexData m_wbfsBg; TexData m_wbfsBg;
TexData m_gameSettingsBg; TexData m_gameSettingsBg;
TexData m_promptBg; TexData m_promptBg;

42
source/menu/menu_error.cpp
View File

@ -5,6 +5,25 @@ s16 m_errorLblMessage;
s16 m_errorLblIcon; s16 m_errorLblIcon;
s16 m_errorLblUser[4]; s16 m_errorLblUser[4];
void CMenu::_hideError(bool instant)
{
m_btnMgr.hide(m_errorLblIcon, instant);
m_btnMgr.hide(m_errorLblMessage, instant);
for(u8 i = 0; i < ARRAY_SIZE(m_errorLblUser); ++i)
if(m_errorLblUser[i] != -1)
m_btnMgr.hide(m_errorLblUser[i], instant);
}
void CMenu::_showError(void)
{
_setBg(m_errorBg, m_errorBg);
m_btnMgr.show(m_errorLblMessage);
m_btnMgr.show(m_errorLblIcon);
for(u8 i = 0; i < ARRAY_SIZE(m_errorLblUser); ++i)
if(m_errorLblUser[i] != -1)
m_btnMgr.show(m_errorLblUser[i]);
}
void CMenu::_error(const wstringEx &msg) void CMenu::_error(const wstringEx &msg)
{ {
SetupInput(); SetupInput();
@ -32,32 +51,13 @@ void CMenu::_error(const wstringEx &msg)
_hideError(false); _hideError(false);
} }
void CMenu::_hideError(bool instant)
{
m_btnMgr.hide(m_errorLblIcon, instant);
m_btnMgr.hide(m_errorLblMessage, instant);
for(u8 i = 0; i < ARRAY_SIZE(m_errorLblUser); ++i)
if(m_errorLblUser[i] != -1)
m_btnMgr.hide(m_errorLblUser[i], instant);
}
void CMenu::_showError(void)
{
_setBg(m_errorBg, m_errorBg);
m_btnMgr.show(m_errorLblMessage);
m_btnMgr.show(m_errorLblIcon);
for(u8 i = 0; i < ARRAY_SIZE(m_errorLblUser); ++i)
if(m_errorLblUser[i] != -1)
m_btnMgr.show(m_errorLblUser[i]);
}
void CMenu::_initErrorMenu() void CMenu::_initErrorMenu()
{ {
TexData texIcon;
TexHandle.fromImageFile(texIcon, fmt("%s/error.png", m_imgsDir.c_str()));
_addUserLabels(m_errorLblUser, ARRAY_SIZE(m_errorLblUser), "ERROR"); _addUserLabels(m_errorLblUser, ARRAY_SIZE(m_errorLblUser), "ERROR");
m_errorBg = _texture("ERROR/BG", "texture", theme.bg, false); m_errorBg = _texture("ERROR/BG", "texture", theme.bg, false);
m_errorLblMessage = _addLabel("ERROR/MESSAGE", theme.lblFont, L"", 112, 20, 500, 440, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE); m_errorLblMessage = _addLabel("ERROR/MESSAGE", theme.lblFont, L"", 112, 20, 500, 440, theme.lblFontColor, FTGX_JUSTIFY_LEFT | FTGX_ALIGN_MIDDLE);
TexData texIcon;
TexHandle.fromImageFile(texIcon, fmt("%s/error.png", m_imgsDir.c_str()));
m_errorLblIcon = _addLabel("ERROR/ICON", theme.lblFont, L"", 40, 200, 64, 64, theme.lblFontColor, 0, texIcon); m_errorLblIcon = _addLabel("ERROR/ICON", theme.lblFont, L"", 40, 200, 64, 64, theme.lblFontColor, 0, texIcon);
// //
_setHideAnim(m_errorLblMessage, "ERROR/MESSAGE", 0, 0, 0.f, 0.f); _setHideAnim(m_errorLblMessage, "ERROR/MESSAGE", 0, 0, 0.f, 0.f);

2
source/menu/menu_partitions.cpp
View File

@ -14,6 +14,8 @@ void CMenu::_hidePartitionsCfg(bool instant)
for(u8 i = 0; i < ARRAY_SIZE(m_partitionsLblUser); ++i) for(u8 i = 0; i < ARRAY_SIZE(m_partitionsLblUser); ++i)
if(m_partitionsLblUser[i] != -1) if(m_partitionsLblUser[i] != -1)
m_btnMgr.hide(m_partitionsLblUser[i], instant); m_btnMgr.hide(m_partitionsLblUser[i], instant);
_hideConfigButtons(instant);
} }
void CMenu::_showPartitionsCfg(void) void CMenu::_showPartitionsCfg(void)