Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbubnikv <bubnikv@gmail.com>2020-03-04 13:55:47 +0300
committerbubnikv <bubnikv@gmail.com>2020-03-04 13:55:47 +0300
commitc9df6e5cf819acc4a03dc0d4e73d08856e5fb457 (patch)
tree038da8cde6ac178bd342526980c24ee6d42c4268 /src/slic3r/GUI/GLCanvas3D.cpp
parent0b96855c2ee2ed0aa2a57890be70679ee7882a00 (diff)
Disabled the 3DConnexion mouse scroll wheel spurious events filtering
on other platforms than Windows.
Diffstat (limited to 'src/slic3r/GUI/GLCanvas3D.cpp')
-rw-r--r--src/slic3r/GUI/GLCanvas3D.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 6b7c02e54..540f82b4c 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;