Fix scrolling in scroll containers (#14702)

luanti-org · Jun 3, 2024 · ec9c000 · ec9c000
1 parent 75f3a21
commit ec9c000
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/irr/include/IEventReceiver.h b/irr/include/IEventReceiver.h
@@ -331,7 +331,6 @@ struct SEvent
 
 		//! A bitmap of button states. You can use isButtonPressed() to determine
 		//! if a button is pressed or not.
-		//! Currently only valid if the event was EMIE_MOUSE_MOVED
 		u32 ButtonStates;
 
 		//! Is the left button pressed down?

diff --git a/irr/src/CIrrDeviceOSX.mm b/irr/src/CIrrDeviceOSX.mm
@@ -852,6 +852,7 @@ - (BOOL)isQuit
 				ievent.MouseInput.Wheel *= 10.0f;
 			else
 				ievent.MouseInput.Wheel *= 5.0f;
+			ievent.MouseInput.ButtonStates = MouseButtonStates;
 			postMouseEvent(event, ievent);
 			break;
 
@@ -1048,6 +1049,7 @@ - (BOOL)isQuit
 			ievent.MouseInput.Event = irr::EMIE_MOUSE_MOVED;
 			ievent.MouseInput.X = x;
 			ievent.MouseInput.Y = y;
+			ievent.MouseInput.ButtonStates = MouseButtonStates;
 			postEventFromUser(ievent);
 		}
 	}

diff --git a/irr/src/CIrrDeviceSDL.cpp b/irr/src/CIrrDeviceSDL.cpp
@@ -667,6 +667,7 @@ bool CIrrDeviceSDL::run()
 #else
 			irrevent.MouseInput.Wheel = SDL_event.wheel.y;
 #endif
+			irrevent.MouseInput.ButtonStates = MouseButtonStates;
 			irrevent.MouseInput.Shift = (keymod & KMOD_SHIFT) != 0;
 			irrevent.MouseInput.Control = (keymod & KMOD_CTRL) != 0;
 			irrevent.MouseInput.X = MouseX;