From 3ee83cd3db52142d1de985e96233eb7c77defa95 Mon Sep 17 00:00:00 2001
From: "chunmao.guo" <chunmao.guo@bambulab.com>
Date: Thu, 5 Jan 2023 15:29:15 +0800
Subject: [PATCH] FIX: [STUDIO-1752] remove background of tips_arrow

Change-Id: I5634e33ea320fc8e5fe9cc9d2b641e4598ce133d
---
 resources/images/tips_arrow.svg |  1 -
 src/slic3r/GUI/ParamsPanel.cpp  | 11 +++--------
 src/slic3r/GUI/ParamsPanel.hpp  |  8 +++-----
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/resources/images/tips_arrow.svg b/resources/images/tips_arrow.svg
index c9ebf5d985..ba8c9ccd10 100644
--- a/resources/images/tips_arrow.svg
+++ b/resources/images/tips_arrow.svg
@@ -1,4 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="24" height="24" fill="#F4F4F4"/>
 <path d="M2.28619 11.4674C1.8995 11.8617 1.90568 12.4949 2.29999 12.8816L8.72575 19.1831C9.12006 19.5698 9.7532 19.5636 10.1399 19.1693C10.5266 18.775 10.5204 18.1419 10.1261 17.7552L4.41431 12.1538L10.0157 6.44201C10.4024 6.04769 10.3962 5.41456 10.0019 5.02786C9.60758 4.64117 8.97445 4.64735 8.58775 5.04166L2.28619 11.4674ZM20.165 11L2.99041 11.1676L3.00992 13.1675L20.1846 13L20.165 11Z" fill="#00AE42"/>
 </svg>
diff --git a/src/slic3r/GUI/ParamsPanel.cpp b/src/slic3r/GUI/ParamsPanel.cpp
index caf4d01dc0..b118f781a2 100644
--- a/src/slic3r/GUI/ParamsPanel.cpp
+++ b/src/slic3r/GUI/ParamsPanel.cpp
@@ -134,7 +134,7 @@ void ParamsPanel::Highlighter::set_timer_owner(wxEvtHandler *owner, int timerid
     m_timer.SetOwner(owner, timerid);
 }
 
-void ParamsPanel::Highlighter::init(std::pair<wxStaticBitmap *, bool *> params, wxWindow *parent)
+void ParamsPanel::Highlighter::init(std::pair<wxWindow *, bool *> params, wxWindow *parent)
     {
     if (m_timer.IsRunning()) invalidate();
     if (!params.first || !params.second) return;
@@ -185,7 +185,6 @@ void ParamsPanel::Highlighter::blink()
 ParamsPanel::ParamsPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name )
     : wxPanel( parent, id, pos, size, style, name )
 {
-    init_bitmaps();
     // BBS: new layout
     SetBackgroundColour(*wxWHITE);
 #if __WXOSX__
@@ -223,7 +222,7 @@ ParamsPanel::ParamsPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, c
         m_mode_region->SetMaxSize({em_unit(this) * 12, -1});
         m_mode_region->SetLabels(_L("Global"), _L("Objects"));
         //m_mode_region->GetSize(&width, &height);
-        m_tips_arrow = new wxStaticBitmap(m_top_panel, wxID_ANY, m_tips_arrow_icon);
+        m_tips_arrow = new ScalableButton(m_top_panel, wxID_ANY, "tips_arrow");
         m_tips_arrow->Hide();
 
         m_title_view = new Label(m_top_panel, _L("Advance"));
@@ -348,11 +347,6 @@ ParamsPanel::ParamsPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, c
     //m_import_from_file->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) { wxGetApp().mainframe->load_config_file(); });
 }
 
-void ParamsPanel::init_bitmaps()
-{
-    m_tips_arrow_icon = create_scaled_bitmap("tips_arrow", nullptr, 24);
-}
-
 void ParamsPanel::create_layout()
 {
 #ifdef __WINDOWS__
@@ -640,6 +634,7 @@ void ParamsPanel::msw_rescale()
     if (m_setting_btn) m_setting_btn->msw_rescale();
     if (m_search_btn) m_search_btn->msw_rescale();
     if (m_compare_btn) m_compare_btn->msw_rescale();
+    if (m_tips_arrow) m_tips_arrow->msw_rescale();
     m_left_sizer->SetMinSize(wxSize(40 * em_unit(this), -1));
     if (m_mode_sizer)
         m_mode_sizer->SetMinSize(-1, 3 * em_unit(this));
diff --git a/src/slic3r/GUI/ParamsPanel.hpp b/src/slic3r/GUI/ParamsPanel.hpp
index 81bc48acae..c39f7cfbc9 100644
--- a/src/slic3r/GUI/ParamsPanel.hpp
+++ b/src/slic3r/GUI/ParamsPanel.hpp
@@ -82,7 +82,7 @@ class ParamsPanel : public wxPanel
         ScalableButton* m_process_icon{ nullptr };
         wxStaticText* m_title_label { nullptr };
         SwitchButton* m_mode_region { nullptr };
-        wxStaticBitmap* m_tips_arrow{ nullptr };
+        ScalableButton *m_tips_arrow{nullptr};
         bool m_tips_arror_blink{false};
         wxStaticText* m_title_view { nullptr };
         SwitchButton* m_mode_view { nullptr };
@@ -116,7 +116,6 @@ class ParamsPanel : public wxPanel
 
         wxBitmap m_toggle_on_icon;
         wxBitmap m_toggle_off_icon;
-        wxBitmap m_tips_arrow_icon;
 
         wxPanel* m_current_tab { nullptr };
 
@@ -125,12 +124,12 @@ class ParamsPanel : public wxPanel
         struct Highlighter
         {
             void set_timer_owner(wxEvtHandler *owner, int timerid = wxID_ANY);
-            void init(std::pair<wxStaticBitmap *, bool *>, wxWindow *parent = nullptr);
+            void init(std::pair<wxWindow *, bool *>, wxWindow *parent = nullptr);
             void blink();
             void invalidate();
 
         private:
-            wxStaticBitmap *m_bitmap { nullptr };
+            wxWindow *      m_bitmap{nullptr};
             bool *         m_show_blink_ptr{nullptr};
             int            m_blink_counter{0};
             wxTimer        m_timer;
@@ -143,7 +142,6 @@ class ParamsPanel : public wxPanel
 		ParamsPanel( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 1800,1080 ), long style = wxTAB_TRAVERSAL, const wxString& type = wxEmptyString );
 		~ParamsPanel();
 
-        void init_bitmaps();
         void rebuild_panels();
         void create_layout();
         //clear the right page