From 289d8a8a1c67a7d4bf216210bdc535b4028aef9d Mon Sep 17 00:00:00 2001 From: bubnikv Date: Wed, 4 Mar 2020 11:55:47 +0100 Subject: [PATCH] Disabled the 3DConnexion mouse scroll wheel spurious events filtering on other platforms than Windows. --- src/slic3r/GUI/GLCanvas3D.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 6b7c02e54b5..540f82b4cfc 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -3082,10 +3082,11 @@ void GLCanvas3D::on_key(wxKeyEvent& evt) void GLCanvas3D::on_mouse_wheel(wxMouseEvent& evt) { - // try to filter out events coming from mouse 3d - Mouse3DController& controller = wxGetApp().plater()->get_mouse3d_controller(); - if (controller.process_mouse_wheel()) +#ifdef WIN32 + // Try to filter out spurious mouse wheel events comming from 3D mouse. + if (wxGetApp().plater()->get_mouse3d_controller().process_mouse_wheel()) return; +#endif if (!m_initialized) return;