GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 11:45:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

DoubleSlider::Control -> Fixed crash when pressing numpad [+] and [-] keys while the horizontal slider has focus

Browse Source
This commit is contained in:
enricoturri1966 2020-05-27 14:29:27 +02:00
parent 94a4689b00
commit a0acf24ab8
1 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/slic3r/GUI/DoubleSlider.cpp
View File

@ -1387,6 +1387,22 @@ void Control::OnWheel(wxMouseEvent& event)
void Control::OnKeyDown(wxKeyEvent &event) void Control::OnKeyDown(wxKeyEvent &event)
{ {
const int key = event.GetKeyCode(); const int key = event.GetKeyCode();
#if ENABLE_GCODE_VIEWER
if (m_draw_mode != dmSequentialGCodeView && key == WXK_NUMPAD_ADD) {
// OnChar() is called immediately after OnKeyDown(), which can cause call of add_tick() twice.
// To avoid this case we should suppress second add_tick() call.
m_ticks.suppress_plus(true);
add_current_tick(true);
}
else if (m_draw_mode != dmSequentialGCodeView && (key == WXK_NUMPAD_SUBTRACT || key == WXK_DELETE || key == WXK_BACK)) {
// OnChar() is called immediately after OnKeyDown(), which can cause call of delete_tick() twice.
// To avoid this case we should suppress second delete_tick() call.
m_ticks.suppress_minus(true);
delete_current_tick();
}
else if (m_draw_mode != dmSequentialGCodeView && event.GetKeyCode() == WXK_SHIFT)
UseDefaultColors(false);
#else
if (key == WXK_NUMPAD_ADD) { if (key == WXK_NUMPAD_ADD) {
// OnChar() is called immediately after OnKeyDown(), which can cause call of add_tick() twice. // OnChar() is called immediately after OnKeyDown(), which can cause call of add_tick() twice.
// To avoid this case we should suppress second add_tick() call. // To avoid this case we should suppress second add_tick() call.
@ -1401,6 +1417,7 @@ void Control::OnKeyDown(wxKeyEvent &event)
} }
else if (event.GetKeyCode() == WXK_SHIFT) else if (event.GetKeyCode() == WXK_SHIFT)
UseDefaultColors(false); UseDefaultColors(false);
#endif // ENABLE_GCODE_VIEWER
else if (is_horizontal()) else if (is_horizontal())
{ {
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
@ -1451,6 +1468,10 @@ void Control::OnKeyUp(wxKeyEvent &event)
void Control::OnChar(wxKeyEvent& event) void Control::OnChar(wxKeyEvent& event)
{ {
const int key = event.GetKeyCode(); const int key = event.GetKeyCode();
#if ENABLE_GCODE_VIEWER
if (m_draw_mode != dmSequentialGCodeView)
{
#endif // ENABLE_GCODE_VIEWER
if (key == '+' && !m_ticks.suppressed_plus()) { if (key == '+' && !m_ticks.suppressed_plus()) {
add_current_tick(true); add_current_tick(true);
m_ticks.suppress_plus(false); m_ticks.suppress_plus(false);
@ -1459,6 +1480,9 @@ void Control::OnChar(wxKeyEvent& event)
delete_current_tick(); delete_current_tick();
m_ticks.suppress_minus(false); m_ticks.suppress_minus(false);
} }
#if ENABLE_GCODE_VIEWER
}
#endif // ENABLE_GCODE_VIEWER
if (key == 'G') if (key == 'G')
#if ENABLE_GCODE_VIEWER #if ENABLE_GCODE_VIEWER
jump_to_value(); jump_to_value();