backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
MrTheShy 2026-03-06 19:22:52 +01:00
parent 6d6f79ad73 cb2b532f70
commit 4b579686e8
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
View file

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

16
Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
View file

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