GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-09-21 05:53:12 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

FIX:added snap connector may not been selected

Browse Source 
Jira: STUDIO-4960
Due to space in snap, added snap connector may result in not been selected

Change-Id: Ib2573a88c867ffc4d5839940a038dc2a193e979e
This commit is contained in:
zhou.xu 2023-10-30 16:04:17 +08:00 committed by Lane.Wei
parent 8bd881b402
commit 275dd249a1
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp
View File

@ -174,6 +174,9 @@ bool GLGizmoAdvancedCut::gizmo_event(SLAGizmoEventType action, const Vec2d &mous
return true; return true;
} }
else if (action == SLAGizmoEventType::LeftUp) { else if (action == SLAGizmoEventType::LeftUp) {
if (m_connectors_editing && m_connector_type == CutConnectorType::Snap && m_add_connector_ok && m_hover_id == -1) {
return true;//Snap connector special logic, due to gaps in the middle of the snap, other connectors such as cylinders are solid
}
if (m_hover_id == -1 && !shift_down && !alt_down) if (m_hover_id == -1 && !shift_down && !alt_down)
unselect_all_connectors(); unselect_all_connectors();
@ -1308,6 +1311,7 @@ void GLGizmoAdvancedCut::validate_connector_settings()
bool GLGizmoAdvancedCut::add_connector(CutConnectors &connectors, const Vec2d &mouse_position) bool GLGizmoAdvancedCut::add_connector(CutConnectors &connectors, const Vec2d &mouse_position)
{ {
m_add_connector_ok = false;
if (!m_connectors_editing) if (!m_connectors_editing)
return false; return false;
@ -1324,6 +1328,7 @@ bool GLGizmoAdvancedCut::add_connector(CutConnectors &connectors, const Vec2d &m
assert(m_selected.size() == connectors.size()); assert(m_selected.size() == connectors.size());
m_parent.set_as_dirty(); m_parent.set_as_dirty();
check_and_update_connectors_state(); check_and_update_connectors_state();
m_add_connector_ok = true;
return true; return true;
} }
return false; return false;

1
src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.hpp
View File

@ -120,6 +120,7 @@ private:
mutable Grabber m_move_x_grabber; mutable Grabber m_move_x_grabber;
bool m_connectors_editing{false}; bool m_connectors_editing{false};
bool m_add_connector_ok{false};
std::vector<size_t> m_invalid_connectors_idxs; std::vector<size_t> m_invalid_connectors_idxs;
bool m_show_shortcuts{false}; bool m_show_shortcuts{false};