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

-replaced clicking on back with clicking on the banner

Browse Source 
directly to toogle size
This commit is contained in:
fix94.1 2012-07-04 19:45:53 +00:00
parent dbd6bee944
commit 87c10f744c
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/images/blank.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 90 B

BIN
data/images/udrawR.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

29
source/menu/menu_game.cpp
View File

@ -49,6 +49,7 @@ extern const u8 favoritesoff_png[];
extern const u8 favoritesoffs_png[]; extern const u8 favoritesoffs_png[];
extern const u8 delete_png[]; extern const u8 delete_png[];
extern const u8 deletes_png[]; extern const u8 deletes_png[];
extern const u8 blank_png[];
//sounds //sounds
extern const u8 gc_ogg[]; extern const u8 gc_ogg[];
@ -61,6 +62,8 @@ static u64 sm_title_id[8] ATTRIBUTE_ALIGN(32);
bool m_zoom_banner = false; bool m_zoom_banner = false;
u32 m_gameBtnPlayFull; u32 m_gameBtnPlayFull;
u32 m_gameBtnBackFull; u32 m_gameBtnBackFull;
u32 m_gameBtnToogle;
u32 m_gameBtnToogleFull;
const string CMenu::_translations[23] = { const string CMenu::_translations[23] = {
"Default", "Default",
@ -314,6 +317,8 @@ void CMenu::_hideGame(bool instant)
m_btnMgr.hide(m_gameBtnBackFull, instant); m_btnMgr.hide(m_gameBtnBackFull, instant);
m_btnMgr.hide(m_gameBtnDelete, instant); m_btnMgr.hide(m_gameBtnDelete, instant);
m_btnMgr.hide(m_gameBtnSettings, instant); m_btnMgr.hide(m_gameBtnSettings, instant);
m_btnMgr.hide(m_gameBtnToogle, instant);
m_btnMgr.hide(m_gameBtnToogleFull, instant);
m_btnMgr.hide(m_gameBtnFavoriteOn, instant); m_btnMgr.hide(m_gameBtnFavoriteOn, instant);
m_btnMgr.hide(m_gameBtnFavoriteOff, instant); m_btnMgr.hide(m_gameBtnFavoriteOff, instant);
@ -349,11 +354,13 @@ void CMenu::_showGame(void)
} }
m_btnMgr.show(m_gameBtnPlay); m_btnMgr.show(m_gameBtnPlay);
m_btnMgr.show(m_gameBtnBack); m_btnMgr.show(m_gameBtnBack);
m_btnMgr.show(m_gameBtnToogle);
} }
else else
{ {
m_btnMgr.show(m_gameBtnPlayFull); m_btnMgr.show(m_gameBtnPlayFull);
m_btnMgr.show(m_gameBtnBackFull); m_btnMgr.show(m_gameBtnBackFull);
m_btnMgr.show(m_gameBtnToogleFull);
} }
} }
@ -489,9 +496,14 @@ void CMenu::_game(bool launch)
m_gcfg1.setBool("ADULTONLY", id, !m_gcfg1.getBool("ADULTONLY", id, false)); m_gcfg1.setBool("ADULTONLY", id, !m_gcfg1.getBool("ADULTONLY", id, false));
else if(m_btnMgr.selected(m_gameBtnBack) || m_btnMgr.selected(m_gameBtnBackFull)) else if(m_btnMgr.selected(m_gameBtnBack) || m_btnMgr.selected(m_gameBtnBackFull))
{ {
//m_gameSound.Stop(); m_gameSound.FreeMemory();
//CheckGameSoundThread(); CheckGameSoundThread();
//break; ClearGameSoundThreadStack();
m_banner->DeleteBanner();
break;
}
else if(m_btnMgr.selected(m_gameBtnToogle) || m_btnMgr.selected(m_gameBtnToogleFull))
{
m_zoom_banner = m_banner->ToogleZoom(); m_zoom_banner = m_banner->ToogleZoom();
m_cfg.setBool(_domainFromView(), "show_full_banner", m_zoom_banner); m_cfg.setBool(_domainFromView(), "show_full_banner", m_zoom_banner);
m_show_zone_game = false; m_show_zone_game = false;
@ -610,8 +622,10 @@ void CMenu::_game(bool launch)
m_btnMgr.hide(b ? m_gameBtnFavoriteOff : m_gameBtnFavoriteOn); m_btnMgr.hide(b ? m_gameBtnFavoriteOff : m_gameBtnFavoriteOn);
m_btnMgr.show(m_gameBtnPlay); m_btnMgr.show(m_gameBtnPlay);
m_btnMgr.show(m_gameBtnBack); m_btnMgr.show(m_gameBtnBack);
m_btnMgr.show(m_gameBtnToogle);
m_btnMgr.hide(m_gameBtnPlayFull); m_btnMgr.hide(m_gameBtnPlayFull);
m_btnMgr.hide(m_gameBtnBackFull); m_btnMgr.hide(m_gameBtnBackFull);
m_btnMgr.hide(m_gameBtnToogleFull);
for(u32 i = 0; i < ARRAY_SIZE(m_gameLblUser); ++i) for(u32 i = 0; i < ARRAY_SIZE(m_gameLblUser); ++i)
{ {
if(m_gameLblUser[i] != -1u) if(m_gameLblUser[i] != -1u)
@ -633,6 +647,7 @@ void CMenu::_game(bool launch)
{ {
m_btnMgr.show(m_gameBtnPlayFull); m_btnMgr.show(m_gameBtnPlayFull);
m_btnMgr.show(m_gameBtnBackFull); m_btnMgr.show(m_gameBtnBackFull);
m_btnMgr.show(m_gameBtnToogleFull);
} }
m_btnMgr.hide(m_gameBtnFavoriteOn); m_btnMgr.hide(m_gameBtnFavoriteOn);
m_btnMgr.hide(m_gameBtnFavoriteOff); m_btnMgr.hide(m_gameBtnFavoriteOff);
@ -642,6 +657,7 @@ void CMenu::_game(bool launch)
m_btnMgr.hide(m_gameBtnDelete); m_btnMgr.hide(m_gameBtnDelete);
m_btnMgr.hide(m_gameBtnPlay); m_btnMgr.hide(m_gameBtnPlay);
m_btnMgr.hide(m_gameBtnBack); m_btnMgr.hide(m_gameBtnBack);
m_btnMgr.hide(m_gameBtnToogle);
for (u32 i = 0; i < ARRAY_SIZE(m_gameLblUser); ++i) for (u32 i = 0; i < ARRAY_SIZE(m_gameLblUser); ++i)
if (m_gameLblUser[i] != -1u) if (m_gameLblUser[i] != -1u)
m_btnMgr.hide(m_gameLblUser[i]); m_btnMgr.hide(m_gameLblUser[i]);
@ -1415,6 +1431,7 @@ void CMenu::_initGameMenu(CMenu::SThemeData &theme)
STexture texDeleteSel; STexture texDeleteSel;
STexture texSettings; STexture texSettings;
STexture texSettingsSel; STexture texSettingsSel;
STexture texToogleBanner;
STexture bgLQ; STexture bgLQ;
texFavOn.fromPNG(favoriteson_png); texFavOn.fromPNG(favoriteson_png);
@ -1429,6 +1446,8 @@ void CMenu::_initGameMenu(CMenu::SThemeData &theme)
texDeleteSel.fromPNG(deletes_png); texDeleteSel.fromPNG(deletes_png);
texSettings.fromPNG(btngamecfg_png); texSettings.fromPNG(btngamecfg_png);
texSettingsSel.fromPNG(btngamecfgs_png); texSettingsSel.fromPNG(btngamecfgs_png);
texToogleBanner.fromPNG(blank_png);
_addUserLabels(theme, m_gameLblUser, ARRAY_SIZE(m_gameLblUser), "GAME"); _addUserLabels(theme, m_gameLblUser, ARRAY_SIZE(m_gameLblUser), "GAME");
m_gameBg = _texture(theme.texSet, "GAME/BG", "texture", theme.bg); m_gameBg = _texture(theme.texSet, "GAME/BG", "texture", theme.bg);
if (m_theme.loaded() && STexture::TE_OK == bgLQ.fromPNGFile(fmt("%s/%s", m_themeDataDir.c_str(), m_theme.getString("GAME/BG", "texture").c_str()), GX_TF_CMPR, ALLOC_MEM2, 64, 64)) if (m_theme.loaded() && STexture::TE_OK == bgLQ.fromPNGFile(fmt("%s/%s", m_themeDataDir.c_str(), m_theme.getString("GAME/BG", "texture").c_str()), GX_TF_CMPR, ALLOC_MEM2, 64, 64))
@ -1444,6 +1463,8 @@ void CMenu::_initGameMenu(CMenu::SThemeData &theme)
m_gameBtnDelete = _addPicButton(theme, "GAME/DELETE_BTN", texDelete, texDeleteSel, 532, 272, 48, 48); m_gameBtnDelete = _addPicButton(theme, "GAME/DELETE_BTN", texDelete, texDeleteSel, 532, 272, 48, 48);
m_gameBtnPlayFull = _addButton(theme, "GAME/PLAY_FULL_BTN", theme.btnFont, L"", 100, 380, 200, 56, theme.btnFontColor); m_gameBtnPlayFull = _addButton(theme, "GAME/PLAY_FULL_BTN", theme.btnFont, L"", 100, 380, 200, 56, theme.btnFontColor);
m_gameBtnBackFull = _addButton(theme, "GAME/BACK_FULL_BTN", theme.btnFont, L"", 340, 380, 200, 56, theme.btnFontColor); m_gameBtnBackFull = _addButton(theme, "GAME/BACK_FULL_BTN", theme.btnFont, L"", 340, 380, 200, 56, theme.btnFontColor);
m_gameBtnToogle = _addPicButton(theme, "GAME/TOOGLE_BTN", texToogleBanner, texToogleBanner, 385, 31, 236, 127);
m_gameBtnToogleFull = _addPicButton(theme, "GAME/TOOGLE_FULL_BTN", texToogleBanner, texToogleBanner, 20, 12, 608, 344);
m_gameButtonsZone.x = m_theme.getInt("GAME/ZONES", "buttons_x", 0); m_gameButtonsZone.x = m_theme.getInt("GAME/ZONES", "buttons_x", 0);
m_gameButtonsZone.y = m_theme.getInt("GAME/ZONES", "buttons_y", 0); m_gameButtonsZone.y = m_theme.getInt("GAME/ZONES", "buttons_y", 0);
@ -1461,6 +1482,8 @@ void CMenu::_initGameMenu(CMenu::SThemeData &theme)
_setHideAnim(m_gameBtnDelete, "GAME/DELETE_BTN", 0, 0, -1.5f, -1.5f); _setHideAnim(m_gameBtnDelete, "GAME/DELETE_BTN", 0, 0, -1.5f, -1.5f);
_setHideAnim(m_gameBtnPlayFull, "GAME/PLAY_FULL_BTN", 200, 0, 1.f, 0.f); _setHideAnim(m_gameBtnPlayFull, "GAME/PLAY_FULL_BTN", 200, 0, 1.f, 0.f);
_setHideAnim(m_gameBtnBackFull, "GAME/BACK_FULL_BTN", 200, 0, 1.f, 0.f); _setHideAnim(m_gameBtnBackFull, "GAME/BACK_FULL_BTN", 200, 0, 1.f, 0.f);
_setHideAnim(m_gameBtnToogle, "GAME/TOOGLE_BTN", 200, 0, 1.f, 0.f);
_setHideAnim(m_gameBtnToogleFull, "GAME/TOOGLE_FULL_BTN", 200, 0, 1.f, 0.f);
_hideGame(true); _hideGame(true);
_textGame(); _textGame();
} }