eaw/Main
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pressing [UP] when on first menu item puts you at the last.

Browse Source 
Pressing [DOWN] when on the last menu item puts you on the first.
This commit is contained in:
Rikard Bengtsson
2019-09-28 23:24:56 +02:00
parent d648fbba62
commit 63642a7624
2 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
menu.cpp
View File

@@ -1003,21 +1003,39 @@ void HandleUI(void)
// Also set parentstate to the appropriate menustate.
if (menumask)
{
if (down && (menumask >= ((uint32_t)1 << (menusub + 1)))) // Any active entries left?
if (down)
{
do
{
menusub++;
} while ((menumask & ((uint32_t)1 << menusub)) == 0);
menustate = parentstate;
if((menumask >= ((uint32_t)1 << (menusub + 1)))) // Any active entries left?
{
do
{
menusub++;
} while ((menumask & ((uint32_t)1 << menusub)) == 0);
}
else
{
menusub = 0; // jump to first item
}
menustate = parentstate;
}
if (up && menusub > 0)
if (up)
{
do
{
--menusub;
} while ((menumask & ((uint32_t)1 << menusub)) == 0);
if (menusub > 0)
{
do
{
--menusub;
} while ((menumask & ((uint32_t)1 << menusub)) == 0);
}
else
{
do
{
menusub++;
} while ((menumask & ((uint32_t)(~0) << (menusub + 1))) != 0); // jump to last item
}
menustate = parentstate;
}
}