bugfix(input): Fix touchpad upward scrolling in UI list boxes (#2586)

Author: afc-afc0

Core/GameEngine/Source/GameClient/Input/Mouse.cpp

@@ -824,7 +824,8 @@ void Mouse::createStreamMessages()
 		{
 			msg = TheMessageStream->appendMessage( GameMessage::MSG_RAW_MOUSE_WHEEL );
 			msg->appendPixelArgument( m_currMouse.pos );
-			msg->appendIntegerArgument( m_currMouse.wheelPos / 120 );  // wheel delta
+			// TheSuperHackers @bugfix Use float wheel delta to preserve fractional values from touchpad input
+			msg->appendRealArgument( m_currMouse.wheelPos / (Real)MOUSE_WHEEL_DELTA );
 			msg->appendIntegerArgument( TheKeyboard->getModifierFlags() );
 		}
 

Generals/Code/GameEngine/Include/Common/MessageStream.h

@@ -131,7 +131,7 @@ class GameMessage : public MemoryPoolObject
 		MSG_RAW_MOUSE_RIGHT_DOUBLE_CLICK,						///< (pixel, modifiers, time)
 		MSG_RAW_MOUSE_RIGHT_BUTTON_UP,							///< (pixel, modifiers, time)
 		MSG_RAW_MOUSE_RIGHT_DRAG,										///< drag of the mouse with a button held down
-		MSG_RAW_MOUSE_WHEEL,												///< (Int spin, + is away, - is toward user)
+		MSG_RAW_MOUSE_WHEEL,												///< (Real spin, + is away, - is toward user)
 		MSG_RAW_MOUSE_END,
 
 		MSG_RAW_KEY_DOWN,														///< (KeyDefType) the given key was pressed (uses Microsoft VK_ codes)

Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp

@@ -416,7 +416,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 		{
 			m_lastMouseMoveTimeMsec = timeGetTime();
 
-			const Int spin = msg->getArgument( 1 )->integer;
+			const Real spin = msg->getArgument( 1 )->real;
 			const Real zoom = -spin * View::ZoomHeightPerSecond;
 			TheTacticalView->userZoom(zoom);
 

Generals/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp

@@ -135,7 +135,7 @@ static GameWindowMessage rawMouseToWindowMessage( const GameMessage *msg )
 
 		// ------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_WHEEL:
-			if( msg->getArgument( 1 )->integer > 0 )
+			if( msg->getArgument( 1 )->real > 0 )
 				gwm = GWM_WHEEL_UP;
 			else
 				gwm = GWM_WHEEL_DOWN;
@@ -266,7 +266,7 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 			ICoord2D mousePos = msg->getArgument( 0 )->pixel;
 
 			// get wheel position
-			Int wheelPos = msg->getArgument( 1 )->integer;
+			Real wheelPos = msg->getArgument( 1 )->real;
 
 			// process wheel event
 			GameWindowMessage gwm = rawMouseToWindowMessage( msg );

GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h

@@ -131,7 +131,7 @@ class GameMessage : public MemoryPoolObject
 		MSG_RAW_MOUSE_RIGHT_DOUBLE_CLICK,						///< (pixel, modifiers, time)
 		MSG_RAW_MOUSE_RIGHT_BUTTON_UP,							///< (pixel, modifiers, time)
 		MSG_RAW_MOUSE_RIGHT_DRAG,										///< drag of the mouse with a button held down
-		MSG_RAW_MOUSE_WHEEL,												///< (Int spin, + is away, - is toward user)
+		MSG_RAW_MOUSE_WHEEL,												///< (Real spin, + is away, - is toward user)
 		MSG_RAW_MOUSE_END,
 
 		MSG_RAW_KEY_DOWN,														///< (KeyDefType) the given key was pressed (uses Microsoft VK_ codes)

GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp

@@ -415,7 +415,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 		{
 			m_lastMouseMoveTimeMsec = timeGetTime();
 
-			const Int spin = msg->getArgument( 1 )->integer;
+			const Real spin = msg->getArgument( 1 )->real;
 			const Real zoom = -spin * View::ZoomHeightPerSecond;
 			TheTacticalView->userZoom(zoom);
 

GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/WindowXlat.cpp

@@ -135,7 +135,7 @@ static GameWindowMessage rawMouseToWindowMessage( const GameMessage *msg )
 
 		// ------------------------------------------------------------------------
 		case GameMessage::MSG_RAW_MOUSE_WHEEL:
-			if( msg->getArgument( 1 )->integer > 0 )
+			if( msg->getArgument( 1 )->real > 0 )
 				gwm = GWM_WHEEL_UP;
 			else
 				gwm = GWM_WHEEL_DOWN;
@@ -284,7 +284,7 @@ GameMessageDisposition WindowTranslator::translateGameMessage(const GameMessage
 			ICoord2D mousePos = msg->getArgument( 0 )->pixel;
 
 			// get wheel position
-			Int wheelPos = msg->getArgument( 1 )->integer;
+			Real wheelPos = msg->getArgument( 1 )->real;
 
 			// process wheel event
 			GameWindowMessage gwm = rawMouseToWindowMessage( msg );