3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 09:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Rectangle selection -> Removed cursor change

Browse source
This commit is contained in:
Enrico Turri 2019-04-29 08:26:08 +02:00
parent 818f7ad647
commit fdf1b8af81
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2391,7 +2391,7 @@ void GLCanvas3D::on_key(wxKeyEvent& evt)
m_mouse.ignore_left_up = true; m_mouse.ignore_left_up = true;
m_dirty = true; m_dirty = true;
} }
set_cursor(Standard); // set_cursor(Standard);
} }
else if (keyCode == WXK_ALT) else if (keyCode == WXK_ALT)
{ {
@ -2402,7 +2402,7 @@ void GLCanvas3D::on_key(wxKeyEvent& evt)
m_mouse.ignore_left_up = true; m_mouse.ignore_left_up = true;
m_dirty = true; m_dirty = true;
} }
set_cursor(Standard); // set_cursor(Standard);
} }
else if (keyCode == WXK_CONTROL) else if (keyCode == WXK_CONTROL)
m_dirty = true; m_dirty = true;
@ -2414,7 +2414,7 @@ void GLCanvas3D::on_key(wxKeyEvent& evt)
if (m_picking_enabled && (m_gizmos.get_current_type() != GLGizmosManager::SlaSupports)) if (m_picking_enabled && (m_gizmos.get_current_type() != GLGizmosManager::SlaSupports))
{ {
m_mouse.ignore_left_up = false; m_mouse.ignore_left_up = false;
set_cursor(Cross); // set_cursor(Cross);
} }
} }
else if (keyCode == WXK_ALT) else if (keyCode == WXK_ALT)
@ -2422,7 +2422,7 @@ void GLCanvas3D::on_key(wxKeyEvent& evt)
if (m_picking_enabled && (m_gizmos.get_current_type() != GLGizmosManager::SlaSupports)) if (m_picking_enabled && (m_gizmos.get_current_type() != GLGizmosManager::SlaSupports))
{ {
m_mouse.ignore_left_up = false; m_mouse.ignore_left_up = false;
set_cursor(Cross); // set_cursor(Cross);
} }
} }
else if (keyCode == WXK_CONTROL) else if (keyCode == WXK_CONTROL)

6
src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
View file

@ -861,14 +861,14 @@ bool GLGizmosManager::on_key(wxKeyEvent& evt, GLCanvas3D& canvas)
} }
} }
if (processed) // if (processed)
canvas.set_cursor(GLCanvas3D::Standard); // canvas.set_cursor(GLCanvas3D::Standard);
} }
else if (evt.GetEventType() == wxEVT_KEY_DOWN) else if (evt.GetEventType() == wxEVT_KEY_DOWN)
{ {
if ((m_current == SlaSupports) && ((keyCode == WXK_SHIFT) || (keyCode == WXK_ALT)) && reinterpret_cast<GLGizmoSlaSupports*>(get_current())->is_in_editing_mode()) if ((m_current == SlaSupports) && ((keyCode == WXK_SHIFT) || (keyCode == WXK_ALT)) && reinterpret_cast<GLGizmoSlaSupports*>(get_current())->is_in_editing_mode())
{ {
canvas.set_cursor(GLCanvas3D::Cross); // canvas.set_cursor(GLCanvas3D::Cross);
processed = true; processed = true;
} }
} }