mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH:add a drop-down arrow to the amsmapping button 

Change-Id: Idb39a4c8a0f9421bce91f11705f30687f2b2d0d9
This commit is contained in:
tao wang 2022-12-10 13:39:47 +08:00 committed by Lane.Wei
parent c41ccedad0
commit 5139edb876
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/slic3r/GUI/AmsMappingPopup.cpp
View File

@ -28,6 +28,10 @@ wxDEFINE_EVENT(EVT_SET_FINISH_MAPPING, wxCommandEvent);
MaterialItem::MaterialItem(wxWindow *parent, wxColour mcolour, wxString mname) MaterialItem::MaterialItem(wxWindow *parent, wxColour mcolour, wxString mname)
: wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize) : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize)
{ {
m_arraw_bitmap_gray = ScalableBitmap(this, "drop_down", FromDIP(12));
m_arraw_bitmap_white = ScalableBitmap(this, "topbar_dropdown", FromDIP(12));
m_material_coloul = mcolour; m_material_coloul = mcolour;
m_material_name = mname; m_material_name = mname;
m_ams_coloul = wxColour(0xEE,0xEE,0xEE); m_ams_coloul = wxColour(0xEE,0xEE,0xEE);
@ -189,6 +193,15 @@ void MaterialItem::doRender(wxDC &dc)
dc.DrawRoundedRectangle(0, 0, MATERIAL_ITEM_SIZE.x, MATERIAL_ITEM_SIZE.y, 5); dc.DrawRoundedRectangle(0, 0, MATERIAL_ITEM_SIZE.x, MATERIAL_ITEM_SIZE.y, 5);
} }
#endif #endif
//arrow
if ( (m_ams_coloul.Red() > 160 && m_ams_coloul.Green() > 160 && m_ams_coloul.Blue() > 160) &&
(m_ams_coloul.Red() < 180 && m_ams_coloul.Green() < 180 && m_ams_coloul.Blue() < 180)) {
dc.DrawBitmap(m_arraw_bitmap_white.bmp(), GetSize().x - m_arraw_bitmap_white.GetBmpSize().x - FromDIP(7), GetSize().y - m_arraw_bitmap_white.GetBmpSize().y);
}
else {
dc.DrawBitmap(m_arraw_bitmap_gray.bmp(), GetSize().x - m_arraw_bitmap_gray.GetBmpSize().x - FromDIP(7), GetSize().y - m_arraw_bitmap_gray.GetBmpSize().y);
}
} }

3
src/slic3r/GUI/AmsMappingPopup.hpp
View File

@ -70,6 +70,9 @@ public:
wxColour m_ams_coloul; wxColour m_ams_coloul;
wxString m_ams_name; wxString m_ams_name;
ScalableBitmap m_arraw_bitmap_gray;
ScalableBitmap m_arraw_bitmap_white;
bool m_selected {false}; bool m_selected {false};
bool m_warning{false}; bool m_warning{false};