From 6ebb3b821573be24c4d877d02755b375b3fd505a Mon Sep 17 00:00:00 2001
From: "xin.zhang" <xin.zhang@bambulab.com>
Date: Thu, 4 Sep 2025 09:36:28 +0800
Subject: [PATCH] ENH: update the PrintOption tooltip style

jira: [STUDIO-14409]
Change-Id: I790257dea5de6aa9ed24ed21cd5f0ce1a61ad719
(cherry picked from commit d16d8efb21677b1ca2b6d928fc4ee2f1aca83ecb)
---
 src/slic3r/GUI/SelectMachine.cpp | 25 +++++++++++++++++++------
 src/slic3r/GUI/SelectMachine.hpp |  3 ++-
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp
index 2afc04a30d..84d9dd5930 100644
--- a/src/slic3r/GUI/SelectMachine.cpp
+++ b/src/slic3r/GUI/SelectMachine.cpp
@@ -539,7 +539,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
         ops_auto, "nozzle_offset_cali"
     );
 
-    m_sizer_options = new wxGridSizer(0, 2, FromDIP(5), FromDIP(28));
+    m_sizer_options = new wxGridSizer(0, 2, FromDIP(5), FromDIP(10));
     m_sizer_options->Add(option_timelapse, 0, wxEXPAND);
     m_sizer_options->Add(option_auto_bed_level, 0, wxEXPAND);
     m_sizer_options->Add(option_flow_dynamics_cali, 0, wxEXPAND);
@@ -4674,10 +4674,15 @@ void SelectMachineDialog::UpdateStatusCheckWarning_ExtensionTool(MachineObject*
      m_printoption_title = new Label(this, title);
      m_printoption_title->SetFont(Label::Body_13);
 
+     m_printoption_tips = new ScalableButton(this, wxID_ANY, "icon_qusetion", wxEmptyString, wxDefaultSize, wxDefaultPosition, wxBU_EXACTFIT | wxNO_BORDER, true);
+     m_printoption_tips->SetMinSize(wxSize(FromDIP(18), FromDIP(18)));
+     m_printoption_tips->SetMaxSize(wxSize(FromDIP(18), FromDIP(18)));
+
      m_printoption_item = new PrintOptionItem(this, m_ops, param);
      m_printoption_item->SetFont(Label::Body_13);
 
      sizer->Add(m_printoption_title, 0, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 0);
+     sizer->Add(m_printoption_tips, 0, wxLEFT | wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, FromDIP(2));
      sizer->AddStretchSpacer();
      sizer->Add(m_printoption_item, 0, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL, 0);
 
@@ -4756,19 +4761,21 @@ bool PrintOption::contain_opt(const std::string &opt) const
 
 void PrintOption::update_options(std::vector<POItem> ops, const wxString &tips)
 {
-    if (m_ops != ops)
-    {
+    if (m_ops != ops) {
         m_ops = ops;
         m_printoption_item->update_options(ops);
     }
 
-    if (m_printoption_title->GetToolTipText() != tips) { m_printoption_title->SetToolTip(tips); }
+    update_tooltip(tips);
 }
 
 void PrintOption::update_tooltip(const wxString &tips)
 {
-    if (m_printoption_title->GetToolTipText() != tips) { m_printoption_title->SetToolTip(tips); }
-    if (m_printoption_item->GetToolTipText() != tips) { m_printoption_item->SetToolTip(tips); }
+    if (m_printoption_tips->GetToolTipText() != tips) {
+        m_printoption_tips->SetToolTip(tips);
+    }
+
+    m_printoption_tips->Show(!m_printoption_tips->GetToolTipText().IsEmpty());
 }
 
 std::string PrintOption::getValue()
@@ -4789,6 +4796,12 @@ int PrintOption::getValueInt()
     }
 }
 
+void PrintOption::msw_rescale()
+{
+    m_printoption_item->msw_rescale();
+    m_printoption_tips->msw_rescale();
+}
+
 PrintOptionItem::PrintOptionItem(wxWindow* parent, std::vector<POItem> ops, std::string param)
     : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize)
 {
diff --git a/src/slic3r/GUI/SelectMachine.hpp b/src/slic3r/GUI/SelectMachine.hpp
index 38b467016b..cb4dbd3442 100644
--- a/src/slic3r/GUI/SelectMachine.hpp
+++ b/src/slic3r/GUI/SelectMachine.hpp
@@ -202,6 +202,7 @@ private:
     std::string         m_param;
     std::vector<POItem> m_ops;
     Label              *m_printoption_title{nullptr};
+    ScalableButton     *m_printoption_tips{ nullptr };
     PrintOptionItem    *m_printoption_item{nullptr};
 
 public:
@@ -221,7 +222,7 @@ public:
     void        update_options(std::vector<POItem> ops, const wxString &tips);
     void        update_tooltip(const wxString &tips);
 
-    void  msw_rescale() { m_printoption_item->msw_rescale(); };
+    void  msw_rescale();
 
     // override funcs
     bool  CanBeFocused() const override { return false; }