From d883c5e6688ae864ba37584aef1bce287d87b345 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Thu, 5 Jan 2023 12:32:54 +0100 Subject: [PATCH] Follow-up of 2ede6686768aadf412e8b44c721b179ebd1e8cec - Tweaks to imgui dialog --- src/slic3r/GUI/Selection.cpp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp index f70963485b..2e92c8b6b0 100644 --- a/src/slic3r/GUI/Selection.cpp +++ b/src/slic3r/GUI/Selection.cpp @@ -2676,7 +2676,7 @@ void Selection::render_debug_window() const return; ImGuiWrapper& imgui = *wxGetApp().imgui(); - imgui.begin(std::string("Selection matrices"), ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse); + imgui.begin(std::string("Selection matrices"), ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoResize); auto volume_name = [this](size_t id) { const GLVolume& v = *(*m_volumes)[id]; @@ -2705,20 +2705,8 @@ void Selection::render_debug_window() const ImGui::EndCombo(); } - const std::vector methods = { "computeRotationScaling", "computeScalingRotation" }; - static size_t current_method_idx = 0; - if (ImGui::BeginCombo("Decomposition method", methods[current_method_idx].c_str())) { - size_t count = 0; - for (const std::string& method : methods) { - const bool is_selected = (current_method_idx == count); - if (ImGui::Selectable(method.c_str(), is_selected)) - current_method_idx = count; - if (is_selected) - ImGui::SetItemDefaultFocus(); - ++count; - } - ImGui::EndCombo(); - } + static int current_method_idx = 0; + ImGui::Combo("Decomposition method", ¤t_method_idx, "computeRotationScaling\0computeScalingRotation\0"); const GLVolume& v = *get_volume(current_vol_idx);