3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-15 02:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Measure: Update measure dialog layout

Browse source
This commit is contained in:
Noisyfox 2023-10-31 20:00:12 +08:00
parent 4843cda535
commit 1bfd9f63b6
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
View file

@ -1856,8 +1856,8 @@ void GLGizmoMeasure::on_render_input_window(float x, float y, float bottom_limit
const bool use_inches = wxGetApp().app_config->get_bool("use_inches"); const bool use_inches = wxGetApp().app_config->get_bool("use_inches");
const std::string units = use_inches ? " " + _u8L("in") : " " + _u8L("mm"); const std::string units = use_inches ? " " + _u8L("in") : " " + _u8L("mm");
const ImGuiTableFlags flags = ImGuiTableFlags_BordersOuter | ImGuiTableFlags_BordersH; // Show selection
if (ImGui::BeginTable("Selection", 2, flags)) { {
auto format_item_text = [this, use_inches, &units](const SelectedFeatures::Item& item) { auto format_item_text = [this, use_inches, &units](const SelectedFeatures::Item& item) {
if (!item.feature.has_value()) if (!item.feature.has_value())
return _u8L("None"); return _u8L("None");
@ -1882,11 +1882,21 @@ void GLGizmoMeasure::on_render_input_window(float x, float y, float bottom_limit
return text; return text;
}; };
add_strings_row_to_table(*m_imgui, _u8L("Selection") + " 1:", ImGuiWrapper::to_ImVec4(SELECTED_1ST_COLOR), format_item_text(m_selected_features.first), const float selection_cap_length = ImGui::CalcTextSize((_u8L("Selection") + " 1").c_str()).x * 2;
ImGuiWrapper::to_ImVec4(SELECTED_1ST_COLOR));
add_strings_row_to_table(*m_imgui, _u8L("Selection") + " 2:", ImGuiWrapper::to_ImVec4(SELECTED_2ND_COLOR), format_item_text(m_selected_features.second), ImGui::AlignTextToFramePadding();
ImGuiWrapper::to_ImVec4(SELECTED_2ND_COLOR)); ImGui::PushStyleColor(ImGuiCol_Text, ImGuiWrapper::to_ImVec4(SELECTED_1ST_COLOR));
ImGui::EndTable(); m_imgui->text(_u8L("Selection") + " 1");
ImGui::SameLine(selection_cap_length);
m_imgui->text(format_item_text(m_selected_features.first));
ImGui::PopStyleColor();
ImGui::AlignTextToFramePadding();
ImGui::PushStyleColor(ImGuiCol_Text, ImGuiWrapper::to_ImVec4(SELECTED_2ND_COLOR));
m_imgui->text(_u8L("Selection") + " 2");
ImGui::SameLine(selection_cap_length);
m_imgui->text(format_item_text(m_selected_features.second));
ImGui::PopStyleColor();
} }
m_imgui->disabled_begin(!m_selected_features.first.feature.has_value()); m_imgui->disabled_begin(!m_selected_features.first.feature.has_value());