mirror of
https://github.com/Fledge68/WiiFlow_Lite.git
synced 2024-11-30 15:14:18 +01:00
-using the dpad_mode without pressing A, just select switch symbol
and press the direction on dpad
This commit is contained in:
parent
fe107171e9
commit
12ac3405ac
@ -173,6 +173,7 @@ int CMenu::main(void)
|
|||||||
bool use_grab = m_cfg.getBool("GENERAL", "use_grab", false);
|
bool use_grab = m_cfg.getBool("GENERAL", "use_grab", false);
|
||||||
show_homebrew = !m_cfg.getBool("HOMEBREW", "disable", false);
|
show_homebrew = !m_cfg.getBool("HOMEBREW", "disable", false);
|
||||||
show_channel = !m_cfg.getBool("GENERAL", "hidechannel", false);
|
show_channel = !m_cfg.getBool("GENERAL", "hidechannel", false);
|
||||||
|
bool dpad_mode = m_cfg.getBool("GENERAL", "dpad_mode", false);
|
||||||
parental_homebrew = m_cfg.getBool("HOMEBREW", "parental", false);
|
parental_homebrew = m_cfg.getBool("HOMEBREW", "parental", false);
|
||||||
|
|
||||||
m_reload = false;
|
m_reload = false;
|
||||||
@ -255,6 +256,19 @@ int CMenu::main(void)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
m_btnMgr.noClick(true);
|
m_btnMgr.noClick(true);
|
||||||
|
if ((m_btnMgr.selected(m_mainBtnChannel) || m_btnMgr.selected(m_mainBtnUsb) || m_btnMgr.selected(m_mainBtnDML) || m_btnMgr.selected(m_mainBtnHomebrew)) && dpad_mode && (BTN_UP_PRESSED || BTN_DOWN_PRESSED || BTN_LEFT_PRESSED || BTN_RIGHT_PRESSED))
|
||||||
|
{
|
||||||
|
if (BTN_UP_PRESSED)
|
||||||
|
m_current_view = COVERFLOW_USB;
|
||||||
|
else if (BTN_DOWN_PRESSED && m_show_dml)
|
||||||
|
m_current_view = COVERFLOW_DML;
|
||||||
|
else if (BTN_LEFT_PRESSED && show_homebrew && (parental_homebrew || !m_locked))
|
||||||
|
m_current_view = COVERFLOW_HOMEBREW;
|
||||||
|
else if (BTN_RIGHT_PRESSED && show_channel)
|
||||||
|
m_current_view = COVERFLOW_CHANNEL;
|
||||||
|
m_category = m_cat.getInt(_domainFromView(), "category", 0);
|
||||||
|
LoadView();
|
||||||
|
}
|
||||||
if (!m_btnMgr.selected(m_mainBtnQuit) && !BTN_B_HELD && (BTN_UP_REPEAT || RIGHT_STICK_UP))
|
if (!m_btnMgr.selected(m_mainBtnQuit) && !BTN_B_HELD && (BTN_UP_REPEAT || RIGHT_STICK_UP))
|
||||||
m_cf.up();
|
m_cf.up();
|
||||||
if (!m_btnMgr.selected(m_mainBtnQuit) && ((!BTN_B_HELD && (BTN_RIGHT_REPEAT || RIGHT_STICK_RIGHT)) || WROLL_RIGHT))
|
if (!m_btnMgr.selected(m_mainBtnQuit) && ((!BTN_B_HELD && (BTN_RIGHT_REPEAT || RIGHT_STICK_RIGHT)) || WROLL_RIGHT))
|
||||||
@ -505,28 +519,14 @@ int CMenu::main(void)
|
|||||||
}
|
}
|
||||||
else if (m_btnMgr.selected(m_mainBtnChannel) || m_btnMgr.selected(m_mainBtnUsb) || m_btnMgr.selected(m_mainBtnDML) || m_btnMgr.selected(m_mainBtnHomebrew))
|
else if (m_btnMgr.selected(m_mainBtnChannel) || m_btnMgr.selected(m_mainBtnUsb) || m_btnMgr.selected(m_mainBtnDML) || m_btnMgr.selected(m_mainBtnHomebrew))
|
||||||
{
|
{
|
||||||
if (m_cfg.getBool("GENERAL", "dpad_mode", false) && (BTN_UP_HELD || BTN_DOWN_HELD || BTN_LEFT_HELD || BTN_RIGHT_HELD))
|
if (m_current_view == COVERFLOW_USB)
|
||||||
{
|
m_current_view = m_show_dml ? COVERFLOW_DML : (show_channel ? COVERFLOW_CHANNEL : ((show_homebrew && (parental_homebrew || !m_locked)) ? COVERFLOW_HOMEBREW : COVERFLOW_USB));
|
||||||
if (BTN_UP_HELD)
|
else if (m_current_view == COVERFLOW_DML)
|
||||||
m_current_view = COVERFLOW_USB;
|
m_current_view = show_channel ? COVERFLOW_CHANNEL : ((show_homebrew && (parental_homebrew || !m_locked)) ? COVERFLOW_HOMEBREW : COVERFLOW_USB);
|
||||||
else if (BTN_DOWN_HELD && m_show_dml)
|
else if (m_current_view == COVERFLOW_CHANNEL)
|
||||||
m_current_view = COVERFLOW_DML;
|
m_current_view = (show_homebrew && (parental_homebrew || !m_locked)) ? COVERFLOW_HOMEBREW : COVERFLOW_USB;
|
||||||
else if (BTN_LEFT_HELD && show_homebrew && (parental_homebrew || !m_locked))
|
else if (m_current_view == COVERFLOW_HOMEBREW)
|
||||||
m_current_view = COVERFLOW_HOMEBREW;
|
m_current_view = COVERFLOW_USB;
|
||||||
else if (BTN_RIGHT_HELD && show_channel)
|
|
||||||
m_current_view = COVERFLOW_CHANNEL;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (m_current_view == COVERFLOW_USB)
|
|
||||||
m_current_view = m_show_dml ? COVERFLOW_DML : (show_channel ? COVERFLOW_CHANNEL : ((show_homebrew && (parental_homebrew || !m_locked)) ? COVERFLOW_HOMEBREW : COVERFLOW_USB));
|
|
||||||
else if (m_current_view == COVERFLOW_DML)
|
|
||||||
m_current_view = show_channel ? COVERFLOW_CHANNEL : ((show_homebrew && (parental_homebrew || !m_locked)) ? COVERFLOW_HOMEBREW : COVERFLOW_USB);
|
|
||||||
else if (m_current_view == COVERFLOW_CHANNEL)
|
|
||||||
m_current_view = (show_homebrew && (parental_homebrew || !m_locked)) ? COVERFLOW_HOMEBREW : COVERFLOW_USB;
|
|
||||||
else if (m_current_view == COVERFLOW_HOMEBREW)
|
|
||||||
m_current_view = COVERFLOW_USB;
|
|
||||||
}
|
|
||||||
m_category = m_cat.getInt(_domainFromView(), "category", 0);
|
m_category = m_cat.getInt(_domainFromView(), "category", 0);
|
||||||
LoadView();
|
LoadView();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user