mirror of
https://github.com/Fledge68/WiiFlow_Lite.git
synced 2024-11-23 19:59:16 +01:00
- Now we can hold 'b' for source menu even if wiimote gestures is enabled. Which means we should be able to remove 'b' on home button and 'b' on mode button.
This commit is contained in:
parent
30af787956
commit
85ff18bd8d
@ -514,20 +514,25 @@ int CMenu::main(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(WROLL_LEFT)
|
else if(WROLL_LEFT)
|
||||||
|
{
|
||||||
m_cf.left();
|
m_cf.left();
|
||||||
|
SourceMenuTimeout = 0;
|
||||||
|
}
|
||||||
else if(WROLL_RIGHT)
|
else if(WROLL_RIGHT)
|
||||||
|
{
|
||||||
m_cf.right();
|
m_cf.right();
|
||||||
|
SourceMenuTimeout = 0;
|
||||||
|
}
|
||||||
if(!BTN_B_HELD)
|
if(!BTN_B_HELD)
|
||||||
{
|
{
|
||||||
SourceMenuTimeout = 0;
|
SourceMenuTimeout = 0;
|
||||||
if(BTN_UP_REPEAT || RIGHT_STICK_UP)
|
if(BTN_UP_REPEAT || RIGHT_STICK_UP)
|
||||||
m_cf.up();
|
m_cf.up();
|
||||||
else if((BTN_RIGHT_REPEAT || RIGHT_STICK_RIGHT) || WROLL_RIGHT)
|
else if(BTN_RIGHT_REPEAT || RIGHT_STICK_RIGHT)
|
||||||
m_cf.right();
|
m_cf.right();
|
||||||
else if(BTN_DOWN_REPEAT || RIGHT_STICK_DOWN)
|
else if(BTN_DOWN_REPEAT || RIGHT_STICK_DOWN)
|
||||||
m_cf.down();
|
m_cf.down();
|
||||||
else if((BTN_LEFT_REPEAT || RIGHT_STICK_LEFT) || WROLL_LEFT)
|
else if(BTN_LEFT_REPEAT || RIGHT_STICK_LEFT)
|
||||||
m_cf.left();
|
m_cf.left();
|
||||||
else if(BTN_1_PRESSED || BTN_2_PRESSED)
|
else if(BTN_1_PRESSED || BTN_2_PRESSED)
|
||||||
{
|
{
|
||||||
@ -682,24 +687,22 @@ int CMenu::main(void)
|
|||||||
_initCF();
|
_initCF();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(!enable_wmote_roll)
|
if(!SourceMenuTimeout && !bheld)
|
||||||
{
|
{
|
||||||
if(!SourceMenuTimeout && !bheld)
|
SourceMenuTimeout = time(0);
|
||||||
{
|
bheld = true;
|
||||||
SourceMenuTimeout = time(0);
|
|
||||||
bheld = true;
|
|
||||||
}
|
|
||||||
if(SourceMenuTimeout && (time(0) - SourceMenuTimeout > 1)) //Source Menu requested
|
|
||||||
{
|
|
||||||
SourceMenuTimeout = 0;
|
|
||||||
_hideMain();
|
|
||||||
if(!_Source()) //Different source selected
|
|
||||||
LoadView();
|
|
||||||
else
|
|
||||||
_showMain();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
if(SourceMenuTimeout && (time(0) - SourceMenuTimeout > 1)) //Source Menu requested
|
||||||
|
{
|
||||||
|
SourceMenuTimeout = 0;
|
||||||
|
_hideMain();
|
||||||
|
if(!_Source()) //Different source selected
|
||||||
|
LoadView();
|
||||||
|
else
|
||||||
|
_showMain();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(done==0 && m_cat.getBool("GENERAL", "category_on_start", false))
|
if(done==0 && m_cat.getBool("GENERAL", "category_on_start", false))
|
||||||
|
Loading…
Reference in New Issue
Block a user