3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ImGUI wrapper text and combo methods shall accept std::string

Browse source 
in UTF8 format.
This commit is contained in:
bubnikv 2019-03-04 12:21:00 +01:00
parent dceaf73ff3
commit bc65827499
2 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/slic3r/GUI/ImGuiWrapper.cpp
View file

@ -239,10 +239,19 @@ bool ImGuiWrapper::checkbox(const wxString &label, bool &value)
return ImGui::Checkbox(label_utf8.c_str(), &value);
}
void ImGuiWrapper::text(const char *label)
{
ImGui::Text(label, NULL);
}
void ImGuiWrapper::text(const std::string &label)
{
this->text(label.c_str());
}
void ImGuiWrapper::text(const wxString &label)
{
auto label_utf8 = into_u8(label);
ImGui::Text(label_utf8.c_str(), NULL);
this->text(into_u8(label).c_str());
}
@ -267,6 +276,24 @@ bool ImGuiWrapper::combo(const wxString& label, const std::vector<wxString>& opt
return false;
}
bool ImGuiWrapper::combo(const wxString& label, const std::vector<std::string>& options, std::string& selection)
{
// this is to force the label to the left of the widget:
text(label);
ImGui::SameLine();
if (ImGui::BeginCombo("", selection.c_str())) {
for (const std::string& option : options) {
bool is_selected = (selection.empty()) ? false : (option == selection);
if (ImGui::Selectable(option.c_str(), is_selected))
selection = option;
}
ImGui::EndCombo();
return true;
}
return false;
}
void ImGuiWrapper::disabled_begin(bool disabled)
{
wxCHECK_RET(!m_disabled, "ImGUI: Unbalanced disabled_begin() call");

3
src/slic3r/GUI/ImGuiWrapper.hpp
View file

@ -57,7 +57,10 @@ public:
bool input_double(const std::string &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 const char *label);
void text(const std::string &label);
void text(const wxString &label);
bool combo(const wxString& label, const std::vector<std::string>& options, std::string& current_selection);
bool combo(const wxString& label, const std::vector<wxString>& options, wxString& current_selection);
void disabled_begin(bool disabled);