From a6fa1fac111ef993f65bade8464de54cf533e5d1 Mon Sep 17 00:00:00 2001
From: "liz.li" <liz.li@bambulab.com>
Date: Mon, 25 Sep 2023 10:29:26 +0800
Subject: [PATCH] ENH: make inserted Gcode more visible

Jira: STUDIO-4030

Change-Id: I09df00bafd12cb41676a225a97507cb64fd142f2
---
 src/slic3r/GUI/IMSlider.cpp | 47 +++++++++++++++++++++++++++++++++++++
 src/slic3r/GUI/IMSlider.hpp |  1 +
 2 files changed, 48 insertions(+)

diff --git a/src/slic3r/GUI/IMSlider.cpp b/src/slic3r/GUI/IMSlider.cpp
index 2cd0fe514..5516480fa 100644
--- a/src/slic3r/GUI/IMSlider.cpp
+++ b/src/slic3r/GUI/IMSlider.cpp
@@ -617,6 +617,44 @@ void IMSlider::draw_colored_band(const ImRect& groove, const ImRect& slideable_r
     }
 }
 
+void IMSlider::draw_custom_label_block(const ImVec2 anchor, Type type)
+{
+    std::string label;
+    switch (type)
+    {
+    case ColorChange:
+        label = "Color";
+        break;
+    case PausePrint:
+        label = "Pause";
+        break;
+    case ToolChange:
+        label = "Color";
+        break;
+    case Template:
+        label = "Template";
+        break;
+    case Custom:
+        label = "Custom";
+        break;
+    case Unknown:
+        break;
+    default:
+        break;
+    }
+
+    const ImVec2 text_size = ImGui::CalcTextSize(label.c_str());
+    const ImVec2 padding = ImVec2(4, 2) * m_scale;
+    const ImU32  clr = IM_COL32(255, 111, 0, 255);
+    const float  rounding = 2.0f * m_scale;
+    ImVec2 block_pos = { anchor.x - text_size.x - padding.x * 2, anchor.y - text_size.y / 2 - padding.y };
+    ImVec2 block_size = { text_size.x + padding.x * 2, text_size.y + padding.y * 2 };
+    ImGui::RenderFrame(block_pos, block_pos + block_size, clr, false, rounding);
+    ImGui::PushStyleColor(ImGuiCol_Text, { 1,1,1,1 });
+    ImGui::RenderText(block_pos + padding, label.c_str());
+    ImGui::PopStyleColor();
+}
+
 void IMSlider::draw_ticks(const ImRect& slideable_region) {
     //if(m_draw_mode != dmRegular)
     //    return;
@@ -692,6 +730,11 @@ void IMSlider::draw_ticks(const ImRect& slideable_region) {
             ImVec2      icon_pos = ImVec2(slideable_region.GetCenter().x + icon_offset.x, tick_pos - icon_offset.y);
             button_with_pos(custom_icon_id, icon_size, icon_pos);
         }
+
+        //draw label block
+        ImVec2 label_block_anchor = ImVec2(slideable_region.GetCenter().x - tick_offset.y, tick_pos);
+        draw_custom_label_block(label_block_anchor, tick_it->type);
+
         ++tick_it;
     }
 
@@ -699,6 +742,10 @@ void IMSlider::draw_ticks(const ImRect& slideable_region) {
               GetSelection() == ssLower  ? m_ticks.ticks.find(TickCode{this->GetLowerValue()}) :
                                            m_ticks.ticks.end();
     if (tick_it != m_ticks.ticks.end()) {
+        //draw label block again, to keep it in front
+        ImVec2 label_block_anchor = ImVec2(slideable_region.GetCenter().x - tick_offset.y, get_tick_pos(tick_it->tick));
+        draw_custom_label_block(label_block_anchor, tick_it->type);
+
         // draw delete icon
         ImVec2      icon_pos       = ImVec2(slideable_region.GetCenter().x + icon_offset.x, get_tick_pos(tick_it->tick) - icon_offset.y);
         button_with_pos(m_delete_icon_id, icon_size, icon_pos);
diff --git a/src/slic3r/GUI/IMSlider.hpp b/src/slic3r/GUI/IMSlider.hpp
index a2fe6c079..c83bd7c24 100644
--- a/src/slic3r/GUI/IMSlider.hpp
+++ b/src/slic3r/GUI/IMSlider.hpp
@@ -145,6 +145,7 @@ protected:
     void render_edit_menu(const TickCode& tick); //menu
     void draw_background_and_groove(const ImRect& bg_rect, const ImRect& groove);
     void draw_colored_band(const ImRect& groove, const ImRect& slideable_region);
+    void draw_custom_label_block(const ImVec2 anchor, Type type);
     void draw_ticks(const ImRect& slideable_region);
     void show_tooltip(const TickCode& tick); //menu
     void show_tooltip(const std::string tooltip); //menu