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

Fix for SPE-2240 : [LINUX & OSX] Cut gizmo "??????" in cut gizmo header

Browse Source
This commit is contained in:
YuSanka 2024-04-12 09:51:54 +02:00 committed by Lukas Matena
parent b2b852a099
commit 598684a4db
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
View File

@ -2639,13 +2639,20 @@ void GLGizmoCut3D::render_snap_specific_input(const std::string& label, const wx
} }
} }
static std::string get_string_from_wchar(const wchar_t& icon)
{
std::wstring tmp;
tmp += icon;
return boost::nowide::narrow(tmp);
}
void GLGizmoCut3D::render_cut_plane_input_window(CutConnectors &connectors) void GLGizmoCut3D::render_cut_plane_input_window(CutConnectors &connectors)
{ {
// if (m_mode == size_t(CutMode::cutPlanar)) { // if (m_mode == size_t(CutMode::cutPlanar)) {
CutMode mode = CutMode(m_mode); CutMode mode = CutMode(m_mode);
if (mode == CutMode::cutPlanar || mode == CutMode::cutTongueAndGroove) { if (mode == CutMode::cutPlanar || mode == CutMode::cutTongueAndGroove) {
ImGui::AlignTextToFramePadding(); ImGui::AlignTextToFramePadding();
ImGuiPureWrap::text(std::wstring(&ImGui::InfoMarkerSmall)); ImGuiPureWrap::text(get_string_from_wchar(ImGui::InfoMarkerSmall));
ImGui::SameLine(); ImGui::SameLine();
ImGuiPureWrap::text_colored(ImGuiPureWrap::COL_ORANGE_LIGHT, ImGuiPureWrap::text_colored(ImGuiPureWrap::COL_ORANGE_LIGHT,
into_u8(get_wraped_wxString(_L("Hold SHIFT key to draw a cut line"), 40))); into_u8(get_wraped_wxString(_L("Hold SHIFT key to draw a cut line"), 40)));
@ -2901,7 +2908,7 @@ void GLGizmoCut3D::init_input_window_data(CutConnectors &connectors)
void GLGizmoCut3D::render_input_window_warning() const void GLGizmoCut3D::render_input_window_warning() const
{ {
const std::string warning_marker = boost::nowide::narrow(std::wstring(&ImGui::WarningMarkerSmall)); const std::string warning_marker = get_string_from_wchar(ImGui::WarningMarkerSmall);
if (! m_invalid_connectors_idxs.empty()) { if (! m_invalid_connectors_idxs.empty()) {
std::string out = warning_marker + _u8L("Invalid connectors detected") + ":"; std::string out = warning_marker + _u8L("Invalid connectors detected") + ":";