3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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-10 11:20:28 +02:00
commit 6043dbd07d
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -2222,9 +2222,12 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
//#endif /* __APPLE__ */ //#endif /* __APPLE__ */
if ((evt.GetModifiers() & ctrlMask) != 0) { if ((evt.GetModifiers() & ctrlMask) != 0) {
switch (keyCode) { switch (keyCode) {
#ifdef __APPLE__
case 'a': case 'a':
case 'A': case 'A':
#else /* __APPLE__ */
case WXK_CONTROL_A: case WXK_CONTROL_A:
#endif /* __APPLE__ */
post_event(SimpleEvent(EVT_GLCANVAS_SELECT_ALL)); post_event(SimpleEvent(EVT_GLCANVAS_SELECT_ALL));
break; break;
#ifdef __APPLE__ #ifdef __APPLE__

5
src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
View File

@ -713,7 +713,12 @@ bool GLGizmosManager::on_char(wxKeyEvent& evt, GLCanvas3D& canvas)
{ {
switch (keyCode) switch (keyCode)
{ {
#ifdef __APPLE__
case 'a':
case 'A':
#else /* __APPLE__ */
case WXK_CONTROL_A: case WXK_CONTROL_A:
#endif /* __APPLE__ */
{ {
// Sla gizmo selects all support points // Sla gizmo selects all support points
if ((m_current == SlaSupports) && gizmo_event(SLAGizmoEventType::SelectAll)) if ((m_current == SlaSupports) && gizmo_event(SLAGizmoEventType::SelectAll))