Merge branch 'pr/keyboard-fixes' into split-screen

This commit is contained in:
MrTheShy 2026-03-06 19:22:52 +01:00
commit 4b579686e8
2 changed files with 16 additions and 14 deletions

View file

@ -1486,12 +1486,26 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
}
break;
case ACTION_MENU_UP:
#ifdef _WINDOWS64
if (g_KBMInput.WasMouseWheelConsumed())
{
handleAdditionalKeyPress(ACTION_MENU_OTHER_STICK_UP);
break;
}
#endif
{
//ui.PlayUISFX(eSFX_Focus);
m_eCurrTapState = eTapStateUp;
}
break;
case ACTION_MENU_DOWN:
#ifdef _WINDOWS64
if (g_KBMInput.WasMouseWheelConsumed())
{
handleAdditionalKeyPress(ACTION_MENU_OTHER_STICK_DOWN);
break;
}
#endif
{
//ui.PlayUISFX(eSFX_Focus);
m_eCurrTapState = eTapStateDown;

View file

@ -1099,13 +1099,7 @@ void IUIScene_CreativeMenu::handleAdditionalKeyPress(int iAction)
break;
case ACTION_MENU_OTHER_STICK_DOWN:
{
int pageStep = TabSpec::rows;
#ifdef _WINDOWS64
if (g_KBMInput.WasMouseWheelConsumed())
{
pageStep = 1;
}
#endif
int pageStep = 1;
m_tabPage[m_curTab] += pageStep;
if(m_tabPage[m_curTab] >= specs[m_curTab]->getPageCount())
{
@ -1119,13 +1113,7 @@ void IUIScene_CreativeMenu::handleAdditionalKeyPress(int iAction)
break;
case ACTION_MENU_OTHER_STICK_UP:
{
int pageStep = TabSpec::rows;
#ifdef _WINDOWS64
if (g_KBMInput.WasMouseWheelConsumed())
{
pageStep = 1;
}
#endif
int pageStep = 1;
m_tabPage[m_curTab] -= pageStep;
if(m_tabPage[m_curTab] < 0)
{