mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX:double click text should change data and exit cursor 

jira: STUDIO-9071
Change-Id: I7a3f5f3da2094e96aff79de61bf236ee9241fde9
This commit is contained in:
zhou.xu 2024-12-03 20:00:09 +08:00 committed by Lane.Wei
parent d9ead02cfa
commit ada57e7175
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4585,9 +4585,10 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
if (hover_volume->is_text()) {
m_selection.add_volumes(Selection::EMode::Volume, {(unsigned) hover_volume_id});
if (type != GLGizmosManager::EType::Text)
m_gizmos.open_gizmo(GLGizmosManager::EType::Text);
if (type == GLGizmosManager::EType::Text)
m_gizmos.open_gizmo(GLGizmosManager::EType::Text); // close text
wxGetApp().obj_list()->update_selections();
m_gizmos.open_gizmo(GLGizmosManager::EType::Text);
return;
}
/* else if (hover_volume->text_configuration.has_value()) {
@ -4598,9 +4599,10 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
}*/
else if(hover_volume->emboss_shape.has_value()){
m_selection.add_volumes(Selection::EMode::Volume, {(unsigned) hover_volume_id});
if (type != GLGizmosManager::EType::Svg)
m_gizmos.open_gizmo(GLGizmosManager::EType::Svg);
if (type == GLGizmosManager::EType::Svg)
m_gizmos.open_gizmo(GLGizmosManager::EType::Svg);// close svg
wxGetApp().obj_list()->update_selections();
m_gizmos.open_gizmo(GLGizmosManager::EType::Svg);
return;
}
}

1
src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
View File

@ -508,6 +508,7 @@ void GLGizmoSVG::on_set_state() {
// Closing gizmo. e.g. selecting another one
if (GLGizmoBase::m_state == GLGizmoBase::Off) {
ImGui::FocusWindow(nullptr); // exit cursor
m_parent.enable_moving(true); // modify by bbs
reset_volume();
} else if (GLGizmoBase::m_state == GLGizmoBase::On) {

1
src/slic3r/GUI/Gizmos/GLGizmoText.cpp
View File

@ -457,6 +457,7 @@ void GLGizmoText::on_set_state()
}
}
else if (m_state == EState::Off) {
ImGui::FocusWindow(nullptr);//exit cursor
m_reedit_text = false;
m_fix_old_tran_flag = false;
close_warning_flag_after_close_or_drag();