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

-added a wiimote battery information bar to the home menu under

Browse Source 
the buttons, it'll display the information in percent
This commit is contained in:
fix94.1 2012-11-29 18:48:44 +00:00
parent f572478789
commit 285e8ec753
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/const_str.hpp
View File

@ -9,5 +9,5 @@
static const string &VERSION_STRING = sfmt("%s (%s-r%s)", APP_NAME, APP_VERSION, SVN_REV); static const string &VERSION_STRING = sfmt("%s (%s-r%s)", APP_NAME, APP_VERSION, SVN_REV);
static const wstringEx SVN_REV_W(SVN_REV); static const wstringEx SVN_REV_W(SVN_REV);
static const wstringEx PLAYER_BATTERY_LABEL("P1 %003.f%% | P2 %003.f%% | P3 %003.f%% | P4 %003.f%%");
#endif #endif

12
source/menu/menu_home.cpp
View File

@ -20,6 +20,8 @@ s16 m_homeBtnExitToPriiloader;
s16 m_homeBtnExitToBootmii; s16 m_homeBtnExitToBootmii;
s16 m_homeBtnExitToNeek; s16 m_homeBtnExitToNeek;
s16 m_homeLblBattery;
STexture m_homeBg; STexture m_homeBg;
bool CMenu::_Home(void) bool CMenu::_Home(void)
@ -30,7 +32,11 @@ bool CMenu::_Home(void)
string prevTheme = m_cfg.getString("GENERAL", "theme", "default"); string prevTheme = m_cfg.getString("GENERAL", "theme", "default");
while(!m_exit) while(!m_exit)
{ {
/* battery gets refreshed in here... */
_mainLoopCommon(); _mainLoopCommon();
/* and it always changes so... */
m_btnMgr.setText(m_homeLblBattery, wfmt(PLAYER_BATTERY_LABEL, min((float)wd[0]->battery_level/2, 100.f),
min((float)wd[1]->battery_level/2, 100.f), min((float)wd[2]->battery_level/2, 100.f), min((float)wd[3]->battery_level/2, 100.f)));
if(BTN_A_PRESSED) if(BTN_A_PRESSED)
{ {
if(m_btnMgr.selected(m_homeBtnSettings)) if(m_btnMgr.selected(m_homeBtnSettings))
@ -178,6 +184,8 @@ void CMenu::_showHome(void)
m_btnMgr.show(m_homeBtnHelp); m_btnMgr.show(m_homeBtnHelp);
m_btnMgr.show(m_homeBtnAbout); m_btnMgr.show(m_homeBtnAbout);
m_btnMgr.show(m_homeBtnExitTo); m_btnMgr.show(m_homeBtnExitTo);
m_btnMgr.show(m_homeLblBattery);
} }
void CMenu::_showExitTo(void) void CMenu::_showExitTo(void)
@ -202,6 +210,8 @@ void CMenu::_hideHome(bool instant)
m_btnMgr.hide(m_homeBtnHelp, instant); m_btnMgr.hide(m_homeBtnHelp, instant);
m_btnMgr.hide(m_homeBtnAbout, instant); m_btnMgr.hide(m_homeBtnAbout, instant);
m_btnMgr.hide(m_homeBtnExitTo, instant); m_btnMgr.hide(m_homeBtnExitTo, instant);
m_btnMgr.hide(m_homeLblBattery, instant);
} }
void CMenu::_hideExitTo(bool instant) void CMenu::_hideExitTo(bool instant)
@ -231,6 +241,7 @@ void CMenu::_initHomeAndExitToMenu()
m_homeBtnHelp = _addButton("HOME/HELP", theme.btnFont, L"", 330, 120, 250, 56, theme.btnFontColor); m_homeBtnHelp = _addButton("HOME/HELP", theme.btnFont, L"", 330, 120, 250, 56, theme.btnFontColor);
m_homeBtnAbout = _addButton("HOME/ABOUT", theme.btnFont, L"", 330, 230, 250, 56, theme.btnFontColor); m_homeBtnAbout = _addButton("HOME/ABOUT", theme.btnFont, L"", 330, 230, 250, 56, theme.btnFontColor);
m_homeBtnExitTo = _addButton("HOME/EXIT_TO", theme.btnFont, L"", 330, 340, 250, 56, theme.btnFontColor); m_homeBtnExitTo = _addButton("HOME/EXIT_TO", theme.btnFont, L"", 330, 340, 250, 56, theme.btnFontColor);
m_homeLblBattery = _addLabel("HOME/BATTERY", theme.btnFont, L"", 60, 420, 520, 56, theme.btnFontColor, FTGX_JUSTIFY_CENTER | FTGX_ALIGN_MIDDLE, theme.btnTexC);
_setHideAnim(m_homeBtnSettings, "HOME/SETTINGS", 0, 0, -2.f, 0.f); _setHideAnim(m_homeBtnSettings, "HOME/SETTINGS", 0, 0, -2.f, 0.f);
_setHideAnim(m_homeBtnReloadCache, "HOME/RELOAD_CACHE", 0, 0, -2.f, 0.f); _setHideAnim(m_homeBtnReloadCache, "HOME/RELOAD_CACHE", 0, 0, -2.f, 0.f);
@ -238,6 +249,7 @@ void CMenu::_initHomeAndExitToMenu()
_setHideAnim(m_homeBtnHelp, "HOME/HELP", 0, 0, -2.f, 0.f); _setHideAnim(m_homeBtnHelp, "HOME/HELP", 0, 0, -2.f, 0.f);
_setHideAnim(m_homeBtnAbout, "HOME/ABOUT", 0, 0, -2.f, 0.f); _setHideAnim(m_homeBtnAbout, "HOME/ABOUT", 0, 0, -2.f, 0.f);
_setHideAnim(m_homeBtnExitTo, "HOME/EXIT_TO", 0, 0, -2.f, 0.f); _setHideAnim(m_homeBtnExitTo, "HOME/EXIT_TO", 0, 0, -2.f, 0.f);
_setHideAnim(m_homeLblBattery, "HOME/BATTERY", 0, 0, -2.f, 0.f);
_textHome(); _textHome();
_hideHome(true); _hideHome(true);