From 377b9e4b45bb7157f580ea92093fc56e24b83203 Mon Sep 17 00:00:00 2001 From: bubnikv Date: Fri, 21 Feb 2020 12:17:46 +0100 Subject: [PATCH] ImGUI input_double wrapper for wxString label. Possible fix of Fix encoding in Hollowing #3683 --- src/slic3r/GUI/ImGuiWrapper.cpp | 6 ++++++ src/slic3r/GUI/ImGuiWrapper.hpp | 1 + 2 files changed, 7 insertions(+) diff --git a/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp index 90ef017fcd..3efa800a92 100644 --- a/src/slic3r/GUI/ImGuiWrapper.cpp +++ b/src/slic3r/GUI/ImGuiWrapper.cpp @@ -286,6 +286,12 @@ bool ImGuiWrapper::input_double(const std::string &label, const double &value, c return ImGui::InputDouble(label.c_str(), const_cast(&value), 0.0f, 0.0f, format.c_str()); } +bool ImGuiWrapper::input_double(const wxString &label, const double &value, const std::string &format) +{ + auto label_utf8 = into_u8(label); + return input_double(label_utf8, value, format); +} + bool ImGuiWrapper::input_vec3(const std::string &label, const Vec3d &value, float width, const std::string &format) { bool value_changed = false; diff --git a/src/slic3r/GUI/ImGuiWrapper.hpp b/src/slic3r/GUI/ImGuiWrapper.hpp index 5118af036d..4175618811 100644 --- a/src/slic3r/GUI/ImGuiWrapper.hpp +++ b/src/slic3r/GUI/ImGuiWrapper.hpp @@ -63,6 +63,7 @@ public: bool button(const wxString &label); bool radio_button(const wxString &label, bool active); bool input_double(const std::string &label, const double &value, const std::string &format = "%.3f"); + bool input_double(const wxString &label, const double &value, const std::string &format = "%.3f"); bool input_vec3(const std::string &label, const Vec3d &value, float width, const std::string &format = "%.3f"); bool checkbox(const wxString &label, bool &value); void text(const char *label);