GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-01 10:02:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fs_dir_per_glyph_SPE-1597

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2023-08-14 13:51:11 +02:00
commit 06df953ebf
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2879,8 +2879,15 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
if (keyCode == WXK_ESCAPE && (_deactivate_undo_redo_toolbar_items() || _deactivate_search_toolbar_item() || _deactivate_arrange_menu()))
return;
if (m_gizmos.on_char(evt))
if (m_gizmos.on_char(evt)) {
if (m_gizmos.get_current_type() == GLGizmosManager::EType::Scale &&
m_gizmos.get_current()->get_state() == GLGizmoBase::EState::On) {
// Update selection from object list to check selection of the cut objects
// It's not allowed to scale separate ct parts
wxGetApp().obj_list()->selection_changed();
}
return;
}
if ((evt.GetModifiers() & ctrlMask) != 0) {
// CTRL is pressed
@ -3596,6 +3603,13 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
update_sequential_clearance(true);
}
}
else if (evt.LeftUp() &&
m_gizmos.get_current_type() == GLGizmosManager::EType::Scale &&
m_gizmos.get_current()->get_state() == GLGizmoBase::EState::On) {
// Update selection from object list to check selection of the cut objects
// It's not allowed to scale separate ct parts
wxGetApp().obj_list()->selection_changed();
}
return;
}

6
src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
View File

@ -99,12 +99,6 @@ void GLGizmoScale3D::enable_ununiversal_scale(bool enable)
m_grabbers[i].enabled = enable;
}
void GLGizmoScale3D::on_set_state()
{
if (m_state == On)
wxGetApp().obj_list()->selection_changed();
}
void GLGizmoScale3D::data_changed(bool is_serializing) {
set_scale(Vec3d::Ones());
}

2
src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
View File

@ -74,8 +74,6 @@ protected:
virtual void on_register_raycasters_for_picking() override;
virtual void on_unregister_raycasters_for_picking() override;
void on_set_state() override;
private:
void render_grabbers_connection(unsigned int id_1, unsigned int id_2, const ColorRGBA& color);