Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_color_class
This commit is contained in:
commit
a677f7f881
1 changed files with 0 additions and 18 deletions
|
@ -560,13 +560,7 @@ RENDER_AGAIN:
|
||||||
m_imgui->text(m_desc.at("offset"));
|
m_imgui->text(m_desc.at("offset"));
|
||||||
ImGui::SameLine(settings_sliders_left, m_imgui->get_item_spacing().x);
|
ImGui::SameLine(settings_sliders_left, m_imgui->get_item_spacing().x);
|
||||||
ImGui::PushItemWidth(window_width - settings_sliders_left);
|
ImGui::PushItemWidth(window_width - settings_sliders_left);
|
||||||
#if ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT
|
|
||||||
m_imgui->slider_float("##offset", &offset, offset_min, offset_max, "%.1f mm", 1.0f, true, _L(opts[0].second->tooltip));
|
m_imgui->slider_float("##offset", &offset, offset_min, offset_max, "%.1f mm", 1.0f, true, _L(opts[0].second->tooltip));
|
||||||
#else
|
|
||||||
m_imgui->slider_float("##offset", &offset, offset_min, offset_max, "%.1f mm");
|
|
||||||
if (m_imgui->get_last_slider_status().hovered)
|
|
||||||
m_imgui->tooltip((_utf8(opts[0].second->tooltip)).c_str(), max_tooltip_width);
|
|
||||||
#endif // ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT
|
|
||||||
|
|
||||||
bool slider_clicked = m_imgui->get_last_slider_status().clicked; // someone clicked the slider
|
bool slider_clicked = m_imgui->get_last_slider_status().clicked; // someone clicked the slider
|
||||||
bool slider_edited =m_imgui->get_last_slider_status().edited; // someone is dragging the slider
|
bool slider_edited =m_imgui->get_last_slider_status().edited; // someone is dragging the slider
|
||||||
|
@ -576,13 +570,7 @@ RENDER_AGAIN:
|
||||||
ImGui::AlignTextToFramePadding();
|
ImGui::AlignTextToFramePadding();
|
||||||
m_imgui->text(m_desc.at("quality"));
|
m_imgui->text(m_desc.at("quality"));
|
||||||
ImGui::SameLine(settings_sliders_left, m_imgui->get_item_spacing().x);
|
ImGui::SameLine(settings_sliders_left, m_imgui->get_item_spacing().x);
|
||||||
#if ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT
|
|
||||||
m_imgui->slider_float("##quality", &quality, quality_min, quality_max, "%.1f", 1.0f, true, _L(opts[1].second->tooltip));
|
m_imgui->slider_float("##quality", &quality, quality_min, quality_max, "%.1f", 1.0f, true, _L(opts[1].second->tooltip));
|
||||||
#else
|
|
||||||
m_imgui->slider_float("##quality", &quality, quality_min, quality_max, "%.1f");
|
|
||||||
if (m_imgui->get_last_slider_status().hovered)
|
|
||||||
m_imgui->tooltip((_utf8(opts[1].second->tooltip)).c_str(), max_tooltip_width);
|
|
||||||
#endif // ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT
|
|
||||||
|
|
||||||
slider_clicked |= m_imgui->get_last_slider_status().clicked;
|
slider_clicked |= m_imgui->get_last_slider_status().clicked;
|
||||||
slider_edited |= m_imgui->get_last_slider_status().edited;
|
slider_edited |= m_imgui->get_last_slider_status().edited;
|
||||||
|
@ -593,13 +581,7 @@ RENDER_AGAIN:
|
||||||
ImGui::AlignTextToFramePadding();
|
ImGui::AlignTextToFramePadding();
|
||||||
m_imgui->text(m_desc.at("closing_distance"));
|
m_imgui->text(m_desc.at("closing_distance"));
|
||||||
ImGui::SameLine(settings_sliders_left, m_imgui->get_item_spacing().x);
|
ImGui::SameLine(settings_sliders_left, m_imgui->get_item_spacing().x);
|
||||||
#if ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT
|
|
||||||
m_imgui->slider_float("##closing_distance", &closing_d, closing_d_min, closing_d_max, "%.1f mm", 1.0f, true, _L(opts[2].second->tooltip));
|
m_imgui->slider_float("##closing_distance", &closing_d, closing_d_min, closing_d_max, "%.1f mm", 1.0f, true, _L(opts[2].second->tooltip));
|
||||||
#else
|
|
||||||
m_imgui->slider_float("##closing_distance", &closing_d, closing_d_min, closing_d_max, "%.1f mm");
|
|
||||||
if (m_imgui->get_last_slider_status().hovered)
|
|
||||||
m_imgui->tooltip((_utf8(opts[2].second->tooltip)).c_str(), max_tooltip_width);
|
|
||||||
#endif // ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT
|
|
||||||
|
|
||||||
slider_clicked |= m_imgui->get_last_slider_status().clicked;
|
slider_clicked |= m_imgui->get_last_slider_status().clicked;
|
||||||
slider_edited |= m_imgui->get_last_slider_status().edited;
|
slider_edited |= m_imgui->get_last_slider_status().edited;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue