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

Added filtering of key auto repeat for SHIFT and CTRL keys in GLCanvas3D

Browse source
This commit is contained in:
enricoturri1966 2022-07-20 08:15:38 +02:00
parent de635f9088
commit 90c49f4c1a
2 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2966,6 +2966,7 @@ void GLCanvas3D::on_key(wxKeyEvent& evt)
m_dirty = true; m_dirty = true;
#endif // !ENABLE_NEW_RECTANGLE_SELECTION #endif // !ENABLE_NEW_RECTANGLE_SELECTION
} }
m_shift_kar_filter.reset_count();
#if ENABLE_NEW_RECTANGLE_SELECTION #if ENABLE_NEW_RECTANGLE_SELECTION
m_dirty = true; m_dirty = true;
#endif // ENABLE_NEW_RECTANGLE_SELECTION #endif // ENABLE_NEW_RECTANGLE_SELECTION
@ -2989,6 +2990,7 @@ void GLCanvas3D::on_key(wxKeyEvent& evt)
m_mouse.set_start_position_3D_as_invalid(); m_mouse.set_start_position_3D_as_invalid();
} }
#endif // ENABLE_NEW_CAMERA_MOVEMENTS #endif // ENABLE_NEW_CAMERA_MOVEMENTS
m_ctrl_kar_filter.reset_count();
m_dirty = true; m_dirty = true;
} }
else if (m_gizmos.is_enabled() && !m_selection.is_empty()) { else if (m_gizmos.is_enabled() && !m_selection.is_empty()) {
@ -3026,7 +3028,10 @@ void GLCanvas3D::on_key(wxKeyEvent& evt)
// set_cursor(Cross); // set_cursor(Cross);
} }
#if ENABLE_NEW_RECTANGLE_SELECTION #if ENABLE_NEW_RECTANGLE_SELECTION
m_dirty = true; if (m_shift_kar_filter.is_first())
m_dirty = true;
m_shift_kar_filter.increase_count();
#endif // ENABLE_NEW_RECTANGLE_SELECTION #endif // ENABLE_NEW_RECTANGLE_SELECTION
} }
else if (keyCode == WXK_ALT) { else if (keyCode == WXK_ALT) {
@ -3035,8 +3040,12 @@ void GLCanvas3D::on_key(wxKeyEvent& evt)
// set_cursor(Cross); // set_cursor(Cross);
} }
} }
else if (keyCode == WXK_CONTROL) else if (keyCode == WXK_CONTROL) {
m_dirty = true; if (m_ctrl_kar_filter.is_first())
m_dirty = true;
m_ctrl_kar_filter.increase_count();
}
else if (m_gizmos.is_enabled() && !m_selection.is_empty()) { else if (m_gizmos.is_enabled() && !m_selection.is_empty()) {
auto do_rotate = [this](double angle_z_rad) { auto do_rotate = [this](double angle_z_rad) {
m_selection.setup_cache(); m_selection.setup_cache();

12
src/slic3r/GUI/GLCanvas3D.hpp
View file

@ -132,6 +132,15 @@ private:
wxTimer* m_timer; wxTimer* m_timer;
}; };
class KeyAutoRepeatFilter
{
size_t m_count{ 0 };
public:
void increase_count() { ++m_count; }
void reset_count() { m_count = 0; }
bool is_first() const { return m_count == 0; }
};
wxDECLARE_EVENT(EVT_GLCANVAS_OBJECT_SELECT, SimpleEvent); wxDECLARE_EVENT(EVT_GLCANVAS_OBJECT_SELECT, SimpleEvent);
@ -545,6 +554,9 @@ private:
bool m_show_picking_texture; bool m_show_picking_texture;
#endif // ENABLE_RENDER_PICKING_PASS #endif // ENABLE_RENDER_PICKING_PASS
KeyAutoRepeatFilter m_shift_kar_filter;
KeyAutoRepeatFilter m_ctrl_kar_filter;
RenderStats m_render_stats; RenderStats m_render_stats;
int m_imgui_undo_redo_hovered_pos{ -1 }; int m_imgui_undo_redo_hovered_pos{ -1 };