3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-24 15:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste

Browse source
This commit is contained in:
Enrico Turri 2019-04-17 14:48:52 +02:00
commit e7dcb9d93a
8 changed files with 123 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -2398,6 +2398,10 @@ void GLCanvas3D::on_mouse_wheel(wxMouseEvent& evt)
}
}
// Inform gizmos about the event so they have the opportunity to react.
if (m_gizmos.on_mouse_wheel(evt, *this))
return;
// Calculate the zoom delta and apply it to the current zoom factor
float zoom = (float)evt.GetWheelRotation() / (float)evt.GetWheelDelta();
set_camera_zoom(zoom);