Work around a wxGTK bug causing duplicate wheel events (fixes #1216)

sirjuddington · Sep 24, 2024 · 3188c78 · 3188c78
1 parent 205e897
commit 3188c78
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/MapEditor/UI/MapCanvas.cpp b/src/MapEditor/UI/MapCanvas.cpp
@@ -449,6 +449,13 @@ void MapCanvas::onMouseMotion(wxMouseEvent& e)
 // -----------------------------------------------------------------------------
 void MapCanvas::onMouseWheel(wxMouseEvent& e)
 {
+	// wxGTK has a bug causing duplicate wheel events, but the duplicates have
+	// exactly the same timestamp, which makes them easy to detect
+	if (e.GetTimestamp() == last_wheel_timestamp_)
+		return;
+	else
+		last_wheel_timestamp_ = e.GetTimestamp();
+
 #ifdef __WXOSX__
 	double mwheel_rotation = (double)e.GetWheelRotation() / (double)e.GetWheelDelta();
 	if (mwheel_rotation < 0)

diff --git a/src/MapEditor/UI/MapCanvas.h b/src/MapEditor/UI/MapCanvas.h
@@ -28,6 +28,7 @@ class MapCanvas : public OGLCanvas, public KeyBindHandler
 	bool            mouse_warp_ = false;
 	vector<int>     fps_avg_;
 	sf::Clock       sf_clock_;
+	long            last_wheel_timestamp_ = -1;
 
 	// Events
 	void onSize(wxSizeEvent& e);