refactor: extract toolbar snap popup

Author: robertvokac

include/MeshCraft/Application/UI/Toolbar.hpp

@@ -20,6 +20,7 @@ class Toolbar final {
                                    bool& showWireframe, bool& showBoundingBox);
     static void drawSurfaceSnap(bool& enabled);
     static void drawSnapToggle(bool& enabled, float translate, float rotate, float scale);
+    static void drawSnapSettings(const std::function<void()>& drawContents);
     static void drawProportionalEdit(bool& enabled, float& radius);
     static void drawGrid(float& spacing, const std::function<void(float)>& setSpacing);
 };

src/MeshCraft/Application/UI/Toolbar.cpp

@@ -52,7 +52,7 @@ float MeshCraftApplication::drawToolbar(float menuBarH, int screenW)
                                     showWireframeMode_, showBoundingBox_);
 
     UI::Toolbar::drawSnapToggle(snapEnabled_, snapTranslate_, snapRotate_, snapScale_);
-    if (ImGui::BeginPopupContextItem("##snapcfg")) {
+    UI::Toolbar::drawSnapSettings([this] {
         ImGui::TextDisabled("Snap Intervals");
         ImGui::Separator();
         // Move presets
@@ -103,8 +103,7 @@ float MeshCraftApplication::drawToolbar(float menuBarH, int screenW)
         ImGui::NewLine();
         ImGui::SetNextItemWidth(120);
         ImGui::DragFloat("##ss", &snapScale_, 0.01f, 0.01f, 10.0f, "%.3g", ImGuiSliderFlags_AlwaysClamp);
-        ImGui::EndPopup();
-    }
+    });
     ImGui::SameLine();
 
     UI::Toolbar::drawSurfaceSnap(surfaceSnapEnabled_);
@@ -214,6 +213,12 @@ void Toolbar::drawSnapToggle(bool& enabled, float translate, float rotate, float
                           translate, rotate, scale);
 }
 
+void Toolbar::drawSnapSettings(const std::function<void()>& drawContents) {
+    if (!ImGui::BeginPopupContextItem("##snapcfg")) return;
+    drawContents();
+    ImGui::EndPopup();
+}
+
 void Toolbar::drawProportionalEdit(bool& enabled, float& radius) {
     const bool wasEnabled = enabled;
     if (wasEnabled) ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.45f, 0.20f, 0.45f, 1.f));