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

Fixed Shift+A to arrange selection

Browse source
This commit is contained in:
enricoturri1966 2020-11-18 15:14:49 +01:00
parent 72f9cc07e8
commit df19697d8e
1 changed files with 21 additions and 13 deletions

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

@ -2909,12 +2909,23 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
return; return;
} }
if ((keyCode == WXK_ESCAPE) && (_deactivate_undo_redo_toolbar_items() || _deactivate_search_toolbar_item())) if (keyCode == WXK_ESCAPE && (_deactivate_undo_redo_toolbar_items() || _deactivate_search_toolbar_item()))
return; return;
if (m_gizmos.on_char(evt)) if (m_gizmos.on_char(evt))
return; return;
auto action_plus = [this](wxKeyEvent& evt) {
if (dynamic_cast<Preview*>(m_canvas->GetParent()) != nullptr)
post_event(wxKeyEvent(EVT_GLCANVAS_EDIT_COLOR_CHANGE, evt));
else
post_event(Event<int>(EVT_GLCANVAS_INCREASE_INSTANCES, +1));
};
auto action_a = [this]() {
post_event(SimpleEvent(EVT_GLCANVAS_ARRANGE));
};
//#ifdef __APPLE__ //#ifdef __APPLE__
// ctrlMask |= wxMOD_RAW_CONTROL; // ctrlMask |= wxMOD_RAW_CONTROL;
//#endif /* __APPLE__ */ //#endif /* __APPLE__ */
@ -3002,8 +3013,11 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
} }
else if ((evt.GetModifiers() & shiftMask) != 0) { else if ((evt.GetModifiers() & shiftMask) != 0) {
switch (keyCode) { switch (keyCode) {
case 'g': case '+': { action_plus(evt); break; }
case 'G': { case 'A':
case 'a': { action_a(); break; }
case 'G':
case 'g': {
if (dynamic_cast<Preview*>(m_canvas->GetParent()) != nullptr) if (dynamic_cast<Preview*>(m_canvas->GetParent()) != nullptr)
post_event(wxKeyEvent(EVT_GLCANVAS_JUMP_TO, evt)); post_event(wxKeyEvent(EVT_GLCANVAS_JUMP_TO, evt));
break; break;
@ -3029,13 +3043,8 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
case '4': { select_view("rear"); break; } case '4': { select_view("rear"); break; }
case '5': { select_view("left"); break; } case '5': { select_view("left"); break; }
case '6': { select_view("right"); break; } case '6': { select_view("right"); break; }
case '+': { case '+': { action_plus(evt); break; }
if (dynamic_cast<Preview*>(m_canvas->GetParent()) != nullptr) case '-': {
post_event(wxKeyEvent(EVT_GLCANVAS_EDIT_COLOR_CHANGE, evt));
else
post_event(Event<int>(EVT_GLCANVAS_INCREASE_INSTANCES, +1));
break; }
case '-': {
if (dynamic_cast<Preview*>(m_canvas->GetParent()) != nullptr) if (dynamic_cast<Preview*>(m_canvas->GetParent()) != nullptr)
post_event(wxKeyEvent(EVT_GLCANVAS_EDIT_COLOR_CHANGE, evt)); post_event(wxKeyEvent(EVT_GLCANVAS_EDIT_COLOR_CHANGE, evt));
else else
@ -3043,7 +3052,7 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
break; } break; }
case '?': { post_event(SimpleEvent(EVT_GLCANVAS_QUESTION_MARK)); break; } case '?': { post_event(SimpleEvent(EVT_GLCANVAS_QUESTION_MARK)); break; }
case 'A': case 'A':
case 'a': { post_event(SimpleEvent(EVT_GLCANVAS_ARRANGE)); break; } case 'a': { action_a(); break; }
case 'B': case 'B':
case 'b': { zoom_to_bed(); break; } case 'b': { zoom_to_bed(); break; }
case 'E': case 'E':
@ -3079,8 +3088,7 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
{ {
if (!m_selection.is_empty()) if (!m_selection.is_empty())
zoom_to_selection(); zoom_to_selection();
else else {
{
if (!m_volumes.empty()) if (!m_volumes.empty())
zoom_to_volumes(); zoom_to_volumes();
else else