Added missing vertical alignments of labels in imgui dialogs
This commit is contained in:
parent
368e9d7f4e
commit
9a5f61c306
@ -131,6 +131,7 @@ void GLGizmoFdmSupports::on_render_input_window(float x, float y, float bottom_l
|
|||||||
m_imgui->text("");
|
m_imgui->text("");
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
|
|
||||||
|
ImGui::AlignTextToFramePadding();
|
||||||
m_imgui->text(m_desc["highlight_by_angle"] + ":");
|
m_imgui->text(m_desc["highlight_by_angle"] + ":");
|
||||||
ImGui::AlignTextToFramePadding();
|
ImGui::AlignTextToFramePadding();
|
||||||
std::string format_str = std::string("%.f") + I18N::translate_utf8("°",
|
std::string format_str = std::string("%.f") + I18N::translate_utf8("°",
|
||||||
|
@ -542,6 +542,7 @@ RENDER_AGAIN:
|
|||||||
|
|
||||||
m_imgui->disabled_begin(! m_enable_hollowing);
|
m_imgui->disabled_begin(! m_enable_hollowing);
|
||||||
float max_tooltip_width = ImGui::GetFontSize() * 20.0f;
|
float max_tooltip_width = ImGui::GetFontSize() * 20.0f;
|
||||||
|
ImGui::AlignTextToFramePadding();
|
||||||
m_imgui->text(m_desc.at("offset"));
|
m_imgui->text(m_desc.at("offset"));
|
||||||
ImGui::SameLine(settings_sliders_left);
|
ImGui::SameLine(settings_sliders_left);
|
||||||
ImGui::PushItemWidth(window_width - settings_sliders_left);
|
ImGui::PushItemWidth(window_width - settings_sliders_left);
|
||||||
@ -558,6 +559,7 @@ RENDER_AGAIN:
|
|||||||
bool slider_released = ImGui::IsItemDeactivatedAfterEdit(); // someone has just released the slider
|
bool slider_released = ImGui::IsItemDeactivatedAfterEdit(); // someone has just released the slider
|
||||||
|
|
||||||
if (current_mode >= quality_mode) {
|
if (current_mode >= quality_mode) {
|
||||||
|
ImGui::AlignTextToFramePadding();
|
||||||
m_imgui->text(m_desc.at("quality"));
|
m_imgui->text(m_desc.at("quality"));
|
||||||
ImGui::SameLine(settings_sliders_left);
|
ImGui::SameLine(settings_sliders_left);
|
||||||
m_imgui->slider_float(" ", &quality, quality_min, quality_max, "%.1f");
|
m_imgui->slider_float(" ", &quality, quality_min, quality_max, "%.1f");
|
||||||
@ -574,6 +576,7 @@ RENDER_AGAIN:
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (current_mode >= closing_d_mode) {
|
if (current_mode >= closing_d_mode) {
|
||||||
|
ImGui::AlignTextToFramePadding();
|
||||||
m_imgui->text(m_desc.at("closing_distance"));
|
m_imgui->text(m_desc.at("closing_distance"));
|
||||||
ImGui::SameLine(settings_sliders_left);
|
ImGui::SameLine(settings_sliders_left);
|
||||||
m_imgui->slider_float(" ", &closing_d, closing_d_min, closing_d_max, "%.1f mm");
|
m_imgui->slider_float(" ", &closing_d, closing_d_min, closing_d_max, "%.1f mm");
|
||||||
@ -621,6 +624,7 @@ RENDER_AGAIN:
|
|||||||
float diameter_upper_cap = 60.;
|
float diameter_upper_cap = 60.;
|
||||||
if (m_new_hole_radius * 2.f > diameter_upper_cap)
|
if (m_new_hole_radius * 2.f > diameter_upper_cap)
|
||||||
m_new_hole_radius = diameter_upper_cap / 2.f;
|
m_new_hole_radius = diameter_upper_cap / 2.f;
|
||||||
|
ImGui::AlignTextToFramePadding();
|
||||||
m_imgui->text(m_desc.at("hole_diameter"));
|
m_imgui->text(m_desc.at("hole_diameter"));
|
||||||
ImGui::SameLine(diameter_slider_left);
|
ImGui::SameLine(diameter_slider_left);
|
||||||
ImGui::PushItemWidth(window_width - diameter_slider_left);
|
ImGui::PushItemWidth(window_width - diameter_slider_left);
|
||||||
@ -636,6 +640,7 @@ RENDER_AGAIN:
|
|||||||
bool edited = ImGui::IsItemEdited();
|
bool edited = ImGui::IsItemEdited();
|
||||||
bool deactivated = ImGui::IsItemDeactivatedAfterEdit();
|
bool deactivated = ImGui::IsItemDeactivatedAfterEdit();
|
||||||
|
|
||||||
|
ImGui::AlignTextToFramePadding();
|
||||||
m_imgui->text(m_desc["hole_depth"]);
|
m_imgui->text(m_desc["hole_depth"]);
|
||||||
ImGui::SameLine(diameter_slider_left);
|
ImGui::SameLine(diameter_slider_left);
|
||||||
m_imgui->slider_float(" ", &m_new_hole_height, 0.f, 10.f, "%.1f mm", 1.f, false);
|
m_imgui->slider_float(" ", &m_new_hole_height, 0.f, 10.f, "%.1f mm", 1.f, false);
|
||||||
@ -692,8 +697,10 @@ RENDER_AGAIN:
|
|||||||
// Following is rendered in both editing and non-editing mode:
|
// Following is rendered in both editing and non-editing mode:
|
||||||
// m_imgui->text("");
|
// m_imgui->text("");
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
if (m_c->object_clipper()->get_position() == 0.f)
|
if (m_c->object_clipper()->get_position() == 0.f) {
|
||||||
|
ImGui::AlignTextToFramePadding();
|
||||||
m_imgui->text(m_desc.at("clipping_of_view"));
|
m_imgui->text(m_desc.at("clipping_of_view"));
|
||||||
|
}
|
||||||
else {
|
else {
|
||||||
if (m_imgui->button(m_desc.at("reset_direction"))) {
|
if (m_imgui->button(m_desc.at("reset_direction"))) {
|
||||||
wxGetApp().CallAfter([this](){
|
wxGetApp().CallAfter([this](){
|
||||||
|
@ -138,6 +138,7 @@ void GLGizmoSeam::on_render_input_window(float x, float y, float bottom_limit)
|
|||||||
|
|
||||||
const float max_tooltip_width = ImGui::GetFontSize() * 20.0f;
|
const float max_tooltip_width = ImGui::GetFontSize() * 20.0f;
|
||||||
|
|
||||||
|
ImGui::AlignTextToFramePadding();
|
||||||
m_imgui->text(m_desc.at("cursor_size"));
|
m_imgui->text(m_desc.at("cursor_size"));
|
||||||
ImGui::SameLine(cursor_size_slider_left);
|
ImGui::SameLine(cursor_size_slider_left);
|
||||||
ImGui::PushItemWidth(window_width - cursor_size_slider_left);
|
ImGui::PushItemWidth(window_width - cursor_size_slider_left);
|
||||||
@ -188,8 +189,10 @@ void GLGizmoSeam::on_render_input_window(float x, float y, float bottom_limit)
|
|||||||
|
|
||||||
|
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
if (m_c->object_clipper()->get_position() == 0.f)
|
if (m_c->object_clipper()->get_position() == 0.f) {
|
||||||
|
ImGui::AlignTextToFramePadding();
|
||||||
m_imgui->text(m_desc.at("clipping_of_view"));
|
m_imgui->text(m_desc.at("clipping_of_view"));
|
||||||
|
}
|
||||||
else {
|
else {
|
||||||
if (m_imgui->button(m_desc.at("reset_direction"))) {
|
if (m_imgui->button(m_desc.at("reset_direction"))) {
|
||||||
wxGetApp().CallAfter([this](){
|
wxGetApp().CallAfter([this](){
|
||||||
|
@ -786,8 +786,7 @@ RENDER_AGAIN:
|
|||||||
|
|
||||||
// Following is rendered in both editing and non-editing mode:
|
// Following is rendered in both editing and non-editing mode:
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
if (m_c->object_clipper()->get_position() == 0.f)
|
if (m_c->object_clipper()->get_position() == 0.f) {
|
||||||
{
|
|
||||||
ImGui::AlignTextToFramePadding();
|
ImGui::AlignTextToFramePadding();
|
||||||
m_imgui->text(m_desc.at("clipping_of_view"));
|
m_imgui->text(m_desc.at("clipping_of_view"));
|
||||||
}
|
}
|
||||||
|
@ -620,10 +620,7 @@ void MainFrame::update_title()
|
|||||||
wxString dirty_marker = (!m_plater->model().objects.empty() && m_plater->is_project_dirty()) ? "*" : "";
|
wxString dirty_marker = (!m_plater->model().objects.empty() && m_plater->is_project_dirty()) ? "*" : "";
|
||||||
if (!dirty_marker.empty() || !project.empty()) {
|
if (!dirty_marker.empty() || !project.empty()) {
|
||||||
if (!dirty_marker.empty() && project.empty())
|
if (!dirty_marker.empty() && project.empty())
|
||||||
//@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
|
|
||||||
project = _L("Untitled");
|
project = _L("Untitled");
|
||||||
// project = _("Untitled");
|
|
||||||
//@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
|
|
||||||
title = dirty_marker + project + " - ";
|
title = dirty_marker + project + " - ";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user