From 72401faedaaa9dc2979f2fb34566582a689d3adc Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Thu, 26 Oct 2023 11:28:44 +0800 Subject: [PATCH] FIX:fix to_ImU32 and modify "Left click" to "Left drag" Jira: STUDIO-4952 Change-Id: I50e9a03400046aaa9e456540193db3db781ce43f --- src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp index 7a7a26063..321dc25b1 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp @@ -426,7 +426,7 @@ bool GLGizmoAdvancedCut::on_init() m_connector_shortcuts.push_back(std::make_pair(alt + _L("Left click"), _L("Remove connector from selection"))); m_connector_shortcuts.push_back(std::make_pair(ctrl + "A", _L("Select all connectors"))); - m_cut_plane_shortcuts.push_back(std::make_pair(shift + _L("Left click"), _L("Plot cut plane"))); + m_cut_plane_shortcuts.push_back(std::make_pair(shift + _L("Left drag"), _L("Plot cut plane"))); m_cut_plane_shortcuts.push_back(std::make_pair(_L("right click"), _L("Assign the part to the other side"))); m_cut_groove_shortcuts.push_back(std::make_pair(shift + _L("Left click"), _L("Plot cut plane"))); @@ -1768,7 +1768,7 @@ bool GLGizmoAdvancedCut::render_cut_mode_combo(double label_width) void GLGizmoAdvancedCut::render_color_marker(float size, const ColorRGBA &color) { - auto to_ImU32 = [](const ColorRGBA &color) -> ImU32 { return ImGui::GetColorU32({color[0], color[1], color[1], color[2]}); }; + auto to_ImU32 = [](const ColorRGBA &color) -> ImU32 { return ImGui::GetColorU32({color[0], color[1], color[2], color[3]}); }; ImGui::SameLine(); const float radius = 0.5f * size; ImVec2 pos = ImGui::GetCurrentWindow()->DC.CursorPos;