diff options
Diffstat (limited to 'xs/src/slic3r/GUI/3DScene.cpp')
| -rw-r--r-- | xs/src/slic3r/GUI/3DScene.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/xs/src/slic3r/GUI/3DScene.cpp b/xs/src/slic3r/GUI/3DScene.cpp index f492ed342..04e7f7dc6 100644 --- a/xs/src/slic3r/GUI/3DScene.cpp +++ b/xs/src/slic3r/GUI/3DScene.cpp @@ -27,6 +27,8 @@ #include <wx/image.h> #include <wx/settings.h> +#include "GUI.hpp" + namespace Slic3r { void GLIndexedVertexArray::load_mesh_flat_shading(const TriangleMesh &mesh) @@ -1144,7 +1146,7 @@ bool _3DScene::LegendTexture::generate(const GCodePreviewData& preview_data, con m_data.clear(); // collects items to render - const std::string& title = preview_data.get_legend_title(); + auto title = GUI::L_str(preview_data.get_legend_title()); const GCodePreviewData::LegendItemsList& items = preview_data.get_legend_items(tool_colors); unsigned int items_count = (unsigned int)items.size(); @@ -1166,7 +1168,7 @@ bool _3DScene::LegendTexture::generate(const GCodePreviewData& preview_data, con unsigned int max_text_height = 0; for (const GCodePreviewData::LegendItem& item : items) { - memDC.GetTextExtent(item.text, &w, &h); + memDC.GetTextExtent(GUI::from_u8(item.text), &w, &h); max_text_width = std::max(max_text_width, (unsigned int)w); max_text_height = std::max(max_text_height, (unsigned int)h); } @@ -1243,7 +1245,7 @@ bool _3DScene::LegendTexture::generate(const GCodePreviewData& preview_data, con memDC.DrawRectangle(wxRect(icon_x_inner, icon_y + 1, px_inner_square, px_inner_square)); // draw text - memDC.DrawText(item.text, text_x, icon_y + text_y_offset); + memDC.DrawText(GUI::from_u8(item.text), text_x, icon_y + text_y_offset); // update y icon_y += icon_y_step; |