From ceae5fb0ed0e65ee5ad43aa2366ef686ff43f6dd Mon Sep 17 00:00:00 2001 From: tao wang Date: Sat, 19 Nov 2022 15:57:22 +0800 Subject: [PATCH] FIX:fixed the border of the material control is not clear on the mac Change-Id: I732690728f0e954ca9cbd37b03d6cf1ebf58f9a0 --- src/slic3r/GUI/AmsMappingPopup.cpp | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/AmsMappingPopup.cpp b/src/slic3r/GUI/AmsMappingPopup.cpp index 8ea623cc6..d58547139 100644 --- a/src/slic3r/GUI/AmsMappingPopup.cpp +++ b/src/slic3r/GUI/AmsMappingPopup.cpp @@ -163,6 +163,19 @@ void MaterialItem::doRender(wxDC &dc) dc.DrawRectangle(FromDIP(1), FromDIP(18), MATERIAL_ITEM_REAL_SIZE.x, FromDIP(8)); ////border +#if __APPLE__ + if (m_material_coloul == *wxWHITE || m_ams_coloul == *wxWHITE) { + dc.SetPen(wxColour(0xAC, 0xAC, 0xAC)); + dc.SetBrush(*wxTRANSPARENT_BRUSH); + dc.DrawRoundedRectangle(1, 1, MATERIAL_ITEM_SIZE.x - 1, MATERIAL_ITEM_SIZE.y - 1, 5); + } + + if (m_selected) { + dc.SetPen(wxColour(0x00, 0xAE, 0x42)); + dc.SetBrush(*wxTRANSPARENT_BRUSH); + dc.DrawRoundedRectangle(1, 1, MATERIAL_ITEM_SIZE.x - 1, MATERIAL_ITEM_SIZE.y - 1, 5); + } +#else if (m_material_coloul == *wxWHITE || m_ams_coloul == *wxWHITE) { dc.SetPen(wxColour(0xAC, 0xAC, 0xAC)); dc.SetBrush(*wxTRANSPARENT_BRUSH); @@ -174,6 +187,9 @@ void MaterialItem::doRender(wxDC &dc) dc.SetBrush(*wxTRANSPARENT_BRUSH); dc.DrawRoundedRectangle(0, 0, MATERIAL_ITEM_SIZE.x, MATERIAL_ITEM_SIZE.y, 5); } +#endif + + } AmsMapingPopup::AmsMapingPopup(wxWindow *parent) @@ -555,7 +571,13 @@ void MappingItem::doRender(wxDC &dc) dc.DrawRoundedRectangle(0, 0, GetSize().x, GetSize().y,5); if (m_coloul == *wxWHITE) { dc.SetPen(wxPen(wxColour(0xAC, 0xAC, 0xAC),1)); - dc.DrawRoundedRectangle(0, 0, GetSize().x, GetSize().y, 5); +#ifdef __APPLE__ + dc.DrawRoundedRectangle(1, 1, GetSize().x - 1, GetSize().y - 1, 5); +#else + dc.DrawRoundedRectangle(0, 0, GetSize().x, GetSize().y, 5); +#endif // __APPLE__ + + } }