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

Revert of 88dbb2db6c6a48a449bb13b5425431f28eee8e0c

Browse Source 
+ Fix for SPE-1835 : Scaling one part of an object after cutting with connectors, when open Scale gizmo with "S"-shortcut.
This commit is contained in:
YuSanka 2023-08-14 12:19:14 +02:00
parent 836a70f4b2
commit f79f2557d6
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

@ -2878,8 +2878,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
@ -3595,6 +3602,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);