3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 20:51:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source
This commit is contained in:
YuSanka 2018-04-27 15:40:25 +02:00
commit 9fb8ee9377
17 changed files with 892 additions and 455 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/Slic3r/GUI/3DScene.pm
View file

@ -389,7 +389,7 @@ sub mouse_event {
$self->_mouse_dragging($e->Dragging);
if ($e->Entering && &Wx::wxMSW) {
if ($e->Entering && (&Wx::wxMSW || $^O eq 'linux')) {
# wxMSW needs focus in order to catch mouse wheel events
$self->SetFocus;
$self->_drag_start_xy(undef);