From 9752fb5810612123164eef8f7dbc2863813ec876 Mon Sep 17 00:00:00 2001
From: enricoturri1966 <enricoturri@seznam.cz>
Date: Mon, 8 Nov 2021 08:29:19 +0100
Subject: [PATCH] Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT - Additional button,
 added to imgui float slider, using svg icon

---
 resources/icons/edit_button_white.svg | 91 +++++++++++++++++++++++++++
 src/imgui/imconfig.h                  |  3 +-
 src/slic3r/GUI/ImGuiWrapper.cpp       | 13 +++-
 3 files changed, 103 insertions(+), 4 deletions(-)
 create mode 100644 resources/icons/edit_button_white.svg

diff --git a/resources/icons/edit_button_white.svg b/resources/icons/edit_button_white.svg
new file mode 100644
index 000000000..9f5cda9c9
--- /dev/null
+++ b/resources/icons/edit_button_white.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   version="1.1"
+   id="Capa_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 348.882 348.882"
+   style="enable-background:new 0 0 348.882 348.882;"
+   xml:space="preserve"
+   sodipodi:docname="edit_button_2.svg"
+   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs209">
+	
+	
+</defs><sodipodi:namedview
+   id="namedview207"
+   pagecolor="#505050"
+   bordercolor="#eeeeee"
+   borderopacity="1"
+   inkscape:pageshadow="0"
+   inkscape:pageopacity="0"
+   inkscape:pagecheckerboard="0"
+   showgrid="false"
+   inkscape:zoom="2.3274346"
+   inkscape:cx="4.9410626"
+   inkscape:cy="174.65582"
+   inkscape:window-width="1920"
+   inkscape:window-height="1001"
+   inkscape:window-x="-9"
+   inkscape:window-y="-9"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Capa_1" />
+<path
+   d="m 333.988,11.758 -0.42,-0.383 C 325.538,4.04 315.129,0 304.258,0 292.071,0 280.37,5.159 272.154,14.153 L 116.803,184.231 c -1.416,1.55 -2.49,3.379 -3.154,5.37 l -18.267,54.762 c -2.112,6.331 -1.052,13.333 2.835,18.729 3.918,5.438 10.23,8.685 16.886,8.685 0,0 0.001,0 0.001,0 2.879,0 5.693,-0.592 8.362,-1.76 l 52.89,-23.138 c 1.923,-0.841 3.648,-2.076 5.063,-3.626 L 336.771,73.176 C 352.937,55.479 351.69,27.929 333.988,11.758 Z m -203.607,222.489 10.719,-32.134 0.904,-0.99 20.316,18.556 -0.904,0.99 z M 314.621,52.943 182.553,197.53 162.237,178.974 294.305,34.386 c 2.583,-2.828 6.118,-4.386 9.954,-4.386 3.365,0 6.588,1.252 9.082,3.53 l 0.419,0.383 c 5.484,5.009 5.87,13.546 0.861,19.03 z"
+   id="path170"
+   style="fill:#ffffff;fill-opacity:1" /><path
+   d="m 303.85,138.388 c -8.284,0 -15,6.716 -15,15 v 127.347 c 0,21.034 -17.113,38.147 -38.147,38.147 H 68.904 c -21.035,0 -38.147,-17.113 -38.147,-38.147 V 100.413 c 0,-21.034 17.113,-38.147 38.147,-38.147 h 131.587 c 8.284,0 15,-6.716 15,-15 0,-8.284 -6.716,-15 -15,-15 H 68.904 c -37.577,0 -68.147,30.571 -68.147,68.147 v 180.321 c 0,37.576 30.571,68.147 68.147,68.147 h 181.798 c 37.576,0 68.147,-30.571 68.147,-68.147 V 153.388 c 0.001,-8.284 -6.715,-15 -14.999,-15 z"
+   id="path172"
+   style="fill:#ffffff;fill-opacity:1" />
+<g
+   id="g176">
+</g>
+<g
+   id="g178">
+</g>
+<g
+   id="g180">
+</g>
+<g
+   id="g182">
+</g>
+<g
+   id="g184">
+</g>
+<g
+   id="g186">
+</g>
+<g
+   id="g188">
+</g>
+<g
+   id="g190">
+</g>
+<g
+   id="g192">
+</g>
+<g
+   id="g194">
+</g>
+<g
+   id="g196">
+</g>
+<g
+   id="g198">
+</g>
+<g
+   id="g200">
+</g>
+<g
+   id="g202">
+</g>
+<g
+   id="g204">
+</g>
+</svg>
diff --git a/src/imgui/imconfig.h b/src/imgui/imconfig.h
index c5627f16b..e95ae3adf 100644
--- a/src/imgui/imconfig.h
+++ b/src/imgui/imconfig.h
@@ -154,7 +154,8 @@ namespace ImGui
     const wchar_t DocumentationHoverButton = 0x2601;
     const wchar_t ClippyMarker             = 0x2602;
     const wchar_t InfoMarker               = 0x2603;
-        
+    const wchar_t SliderFloatEditBtnIcon   = 0x2604;
+
 //    void MyFunction(const char* name, const MyMatrix44& v);
 }
 
diff --git a/src/slic3r/GUI/ImGuiWrapper.cpp b/src/slic3r/GUI/ImGuiWrapper.cpp
index d18b7bf91..edd1ed2d9 100644
--- a/src/slic3r/GUI/ImGuiWrapper.cpp
+++ b/src/slic3r/GUI/ImGuiWrapper.cpp
@@ -8,6 +8,9 @@
 #include <boost/format.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/filesystem.hpp>
+#if ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT
+#include <boost/nowide/convert.hpp>
+#endif // ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT
 
 #include <wx/string.h>
 #include <wx/event.h>
@@ -48,7 +51,9 @@ static const std::map<const wchar_t, std::string> font_icons = {
     {ImGui::RightArrowHoverButton , "notification_right_hover"      },
     {ImGui::PreferencesButton      , "notification_preferences"      },
     {ImGui::PreferencesHoverButton , "notification_preferences_hover"},
-   
+#if ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT
+    {ImGui::SliderFloatEditBtnIcon, "edit_button_white"              },
+#endif // ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT
 };
 static const std::map<const wchar_t, std::string> font_icons_large = {
     {ImGui::CloseNotifButton        , "notification_close"              },
@@ -492,8 +497,10 @@ bool ImGuiWrapper::slider_float(const char* label, float* v, float v_min, float
         const ImGuiStyle& style = ImGui::GetStyle();
         ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, { 1, style.ItemSpacing.y });
         ImGui::SameLine();
-        const std::string btn_name = "..." + std::string(label);
-        if (ImGui::Button(btn_name.c_str())) {
+
+        std::wstring btn_name;
+        btn_name = ImGui::SliderFloatEditBtnIcon + boost::nowide::widen(std::string(label));
+        if (ImGui::Button(into_u8(btn_name).c_str())) {
             ImGui::SetKeyboardFocusHere(-1);
             this->set_requires_extra_frame();
         }