From fa59afd9f888905e5674a8ba359223cfea20e009 Mon Sep 17 00:00:00 2001 From: Mack Date: Thu, 13 Feb 2025 09:46:11 +0800 Subject: [PATCH] ENH:change other filament icon jira: STUDIO-10344 Change-Id: I008f2cd1aace5ee4c4d65ffc8b53c4d5bd866bc9 --- src/slic3r/GUI/DragDropPanel.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/slic3r/GUI/DragDropPanel.cpp b/src/slic3r/GUI/DragDropPanel.cpp index 4897b29e6..db11adbc1 100644 --- a/src/slic3r/GUI/DragDropPanel.cpp +++ b/src/slic3r/GUI/DragDropPanel.cpp @@ -102,15 +102,15 @@ void ColorPanel::OnPaint(wxPaintEvent &event) wxPaintDC dc(this); wxSize size = GetSize(); std::string replace_color = m_color.GetAsString(wxC2S_HTML_SYNTAX).ToStdString(); - std::string svg_name = "filament_green"; + std::string svg_name = "outlined_rect"; if (replace_color == "#FFFFFF00") { - svg_name = "filament_transparent2"; + svg_name = "outlined_rect_transparent"; } - wxBitmap bmp = ScalableBitmap(this, svg_name, 40, false, false, false, { replace_color }).bmp(); + wxBitmap bmp = ScalableBitmap(this, svg_name, 35, false, false, false, { replace_color }).bmp(); dc.DrawBitmap(bmp, wxPoint(0,0)); wxString label = wxString::Format(wxT("%d"), m_filament_id); dc.SetTextForeground(m_color.GetLuminance() < 0.51 ? *wxWHITE : *wxBLACK); // set text color - dc.DrawLabel(label, wxRect(0, 0, size.GetWidth(), size.GetHeight()), wxALIGN_CENTER); + dc.DrawLabel(label, wxRect(2, -3, size.GetWidth(), size.GetHeight()), wxALIGN_CENTER); } /////////////// ColorPanel end ////////////////////////