Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix controller paging regression in creative menu

Browse Source 
Preserve smooth row-by-row scrolling for mouse wheel input, but restore
full-page movement for controller/menu scroll actions in the creative
inventory.

Commit 3093ca3 changed page indexing to support smooth scrolling, which
caused ACTION_MENU_OTHER_STICK_UP/DOWN to advance by one row instead of
one page. Track whether the scroll action originated from the mouse
wheel and only use single-row steps in that case.

Fixes #253
This commit is contained in:
daoge_cmd
2026-03-05 01:38:34 +08:00
parent ef66f6736d
commit 7b35df8714
3 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
View File

@@ -1098,7 +1098,15 @@ void IUIScene_CreativeMenu::handleAdditionalKeyPress(int iAction)
}
break;
case ACTION_MENU_OTHER_STICK_DOWN:
++m_tabPage[m_curTab];
{
int pageStep = TabSpec::rows;
#ifdef _WINDOWS64
if (g_KBMInput.WasMouseWheelConsumed())
{
pageStep = 1;
}
#endif
m_tabPage[m_curTab] += pageStep;
if(m_tabPage[m_curTab] >= specs[m_curTab]->getPageCount())
{
m_tabPage[m_curTab] = specs[m_curTab]->getPageCount() - 1;
@@ -1107,9 +1115,18 @@ void IUIScene_CreativeMenu::handleAdditionalKeyPress(int iAction)
{
switchTab(m_curTab);
}
}
break;
case ACTION_MENU_OTHER_STICK_UP:
--m_tabPage[m_curTab];
{
int pageStep = TabSpec::rows;
#ifdef _WINDOWS64
if (g_KBMInput.WasMouseWheelConsumed())
{
pageStep = 1;
}
#endif
m_tabPage[m_curTab] -= pageStep;
if(m_tabPage[m_curTab] < 0)
{
m_tabPage[m_curTab] = 0;
@@ -1118,6 +1135,7 @@ void IUIScene_CreativeMenu::handleAdditionalKeyPress(int iAction)
{
switchTab(m_curTab);
}
}
break;
}
}

5
Minecraft.Client/Windows64/KeyboardMouseInput.cpp
View File

@@ -33,6 +33,7 @@ void KeyboardMouseInput::Init()
m_mouseDeltaAccumX = 0;
m_mouseDeltaAccumY = 0;
m_mouseWheelAccum = 0;
m_mouseWheelConsumed = false;
m_mouseGrabbed = false;
m_cursorHiddenForUI = false;
m_windowFocused = true;
@@ -67,6 +68,7 @@ void KeyboardMouseInput::ClearAllState()
m_mouseDeltaAccumX = 0;
m_mouseDeltaAccumY = 0;
m_mouseWheelAccum = 0;
m_mouseWheelConsumed = false;
}
void KeyboardMouseInput::Tick()
@@ -88,6 +90,7 @@ void KeyboardMouseInput::Tick()
m_mouseDeltaY = m_mouseDeltaAccumY;
m_mouseDeltaAccumX = 0;
m_mouseDeltaAccumY = 0;
m_mouseWheelConsumed = false;
m_hasInput = (m_mouseDeltaX != 0 || m_mouseDeltaY != 0 || m_mouseWheelAccum != 0);
if (!m_hasInput)
@@ -172,6 +175,8 @@ void KeyboardMouseInput::OnMouseWheel(int delta)
int KeyboardMouseInput::GetMouseWheel()
{
int val = m_mouseWheelAccum;
if (val != 0)
m_mouseWheelConsumed = true;
m_mouseWheelAccum = 0;
return val;
}

4
Minecraft.Client/Windows64/KeyboardMouseInput.h
View File

@@ -59,7 +59,8 @@ public:
int GetMouseWheel();
int PeekMouseWheel() const { return m_mouseWheelAccum; }
void ConsumeMouseWheel() { m_mouseWheelAccum = 0; }
void ConsumeMouseWheel() { if (m_mouseWheelAccum != 0) m_mouseWheelConsumed = true; m_mouseWheelAccum = 0; }
bool WasMouseWheelConsumed() const { return m_mouseWheelConsumed; }
// Per-frame delta consumption for low-latency mouse look.
// Reads and clears the raw accumulators (not the per-tick snapshot).
@@ -114,6 +115,7 @@ private:
int m_mouseDeltaAccumY;
int m_mouseWheelAccum;
bool m_mouseWheelConsumed;
bool m_mouseGrabbed;