FIX: the dark mode n3s SVG center is not empty, which will cover the AMS color
jira: [STUDIO-10308] Change-Id: I67c5bdb753abfe9fa233e427a7b518c2fad4fd01
This commit is contained in:
parent
07475fab75
commit
0730c4ec51
|
@ -1,17 +1,15 @@
|
|||
<svg width="28" height="32" viewBox="0 0 28 32" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<g clip-path="url(#clip0_21155_56756)">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M4 0C1.79086 0 0 1.79086 0 4V28C0 30.2091 1.79086 32 4 32H24C26.2091 32 28 30.2091 28 28V4C28 1.79086 26.2091 0 24 0H4ZM20.3462 8H8.63721V24H20.3462V8Z" fill="#2F2E33"/>
|
||||
<mask id="mask0_21155_56756" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="4" y="3" width="20" height="26">
|
||||
<path d="M24 3.5H4V28.5H24V3.5Z" fill="white"/>
|
||||
</mask>
|
||||
<g mask="url(#mask0_21155_56756)">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M11 16.2871H4V28.2871H24V16.2871H17V18.5488C17 20.2057 15.6569 21.5488 14 21.5488C12.3432 21.5488 11 20.2057 11 18.5488V16.2871Z" fill="#767676"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.1838 4.28711C8.32088 4.28711 6 6.60799 6 9.47093V16.2871H11V12.5488C11 10.8919 12.3432 9.54883 14 9.54883C15.6569 9.54883 17 10.8919 17 12.5488V16.2871H22V9.47093C22 6.60799 19.6791 4.28711 16.8162 4.28711H11.1838Z" fill="#BFBFBF"/>
|
||||
</g>
|
||||
</g>
|
||||
<defs>
|
||||
<clipPath id="clip0_21155_56756">
|
||||
<rect width="28" height="32" fill="white"/>
|
||||
</clipPath>
|
||||
</defs>
|
||||
</svg>
|
||||
<svg width="29" height="33" xmlns="http://www.w3.org/2000/svg" fill="none">
|
||||
<defs>
|
||||
<clipPath id="clip0_20951_60572">
|
||||
<rect id="svg_1" x="4.77881" y="3.94775" fill="white" height="25" width="20"/>
|
||||
</clipPath>
|
||||
</defs>
|
||||
<g>
|
||||
<title _mstTextHash="5637814" _mstHash="1">第 1 层</title>
|
||||
<path id="svg_2" fill="#2d2d31" d="m4.77881,0.44775c-2.20914,0 -4,1.79086 -4,4l0,24.00005c0,2.2091 1.79086,4 4,4l19.99999,0c2.2091,0 4,-1.7909 4,-4l0,-24.00005c0,-2.20914 -1.7909,-4 -4,-4l-19.99999,0zm16.34619,8l-11.70898,0l0,16.00005l11.70898,0l0,-16.00005z" clip-rule="evenodd" fill-rule="evenodd"/>
|
||||
<g id="svg_3" clip-path="url(#clip0_20951_60572)">
|
||||
<path id="svg_4" fill="#CECECE" d="m11.7788,16.7349l-6.99999,0l0,12l19.99999,0l0,-12l-7,0l0,2.2617c0,1.6569 -1.3431,3 -3,3c-1.6568,0 -3,-1.3431 -3,-3l0,-2.2617z" clip-rule="evenodd" fill-rule="evenodd"/>
|
||||
<path id="svg_5" fill="#EEEEEE" d="m11.9626,4.73486c-2.86291,0 -5.18379,2.32088 -5.18379,5.18382l0,6.81622l4.99999,0l0,-3.7383c0,-1.6569 1.3432,-3.00002 3,-3.00002c1.6569,0 3,1.34312 3,3.00002l0,3.7383l5,0l0,-6.81622c0,-2.86294 -2.3209,-5.18382 -5.1838,-5.18382l-5.6324,0z" clip-rule="evenodd" fill-rule="evenodd"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.2 KiB |
|
@ -835,7 +835,7 @@ void CalibrationPresetPage::create_filament_list_panel(wxWindow* parent)
|
|||
AMSinfo temp_info = AMSinfo{ std::to_string(i), std::vector<Caninfo>{} };
|
||||
auto amsitem = new AMSPreview(m_multi_ams_panel, wxID_ANY, temp_info);
|
||||
amsitem->Bind(wxEVT_LEFT_DOWN, [this, amsitem](wxMouseEvent& e) {
|
||||
on_switch_ams(amsitem->m_amsinfo.ams_id);
|
||||
on_switch_ams(amsitem->get_ams_id());
|
||||
e.Skip();
|
||||
});
|
||||
m_ams_preview_list.push_back(amsitem);
|
||||
|
@ -960,7 +960,7 @@ void CalibrationPresetPage::create_multi_extruder_filament_list_panel(wxWindow *
|
|||
m_main_ams_preview_list.push_back(preview_ams_item);
|
||||
size_t index = m_main_ams_preview_list.size() - 1;
|
||||
preview_ams_item->Bind(wxEVT_LEFT_DOWN, [this, index](wxMouseEvent &e) {
|
||||
update_multi_extruder_filament_combobox(m_main_ams_preview_list[index]->m_amsinfo.ams_id, 0);
|
||||
update_multi_extruder_filament_combobox(m_main_ams_preview_list[index]->get_ams_id(), 0);
|
||||
e.Skip();
|
||||
});
|
||||
ams_items_sizer->Add(preview_ams_item, 0, wxALIGN_CENTER | wxRIGHT, FromDIP(6));
|
||||
|
@ -1022,7 +1022,7 @@ void CalibrationPresetPage::create_multi_extruder_filament_list_panel(wxWindow *
|
|||
m_deputy_ams_preview_list.push_back(preview_ams_item);
|
||||
size_t index = m_deputy_ams_preview_list.size() - 1;
|
||||
preview_ams_item->Bind(wxEVT_LEFT_DOWN, [this, index](wxMouseEvent &e) {
|
||||
update_multi_extruder_filament_combobox(m_deputy_ams_preview_list[index]->m_amsinfo.ams_id, 1);
|
||||
update_multi_extruder_filament_combobox(m_deputy_ams_preview_list[index]->get_ams_id(), 1);
|
||||
e.Skip();
|
||||
});
|
||||
ams_items_sizer->Add(preview_ams_item, 0, wxALIGN_CENTER | wxRIGHT, FromDIP(6));
|
||||
|
@ -1330,7 +1330,7 @@ void CalibrationPresetPage::on_switch_ams(std::string ams_id)
|
|||
{
|
||||
for (auto i = 0; i < m_ams_preview_list.size(); i++) {
|
||||
AMSPreview* item = m_ams_preview_list[i];
|
||||
if (item->m_amsinfo.ams_id == ams_id) {
|
||||
if (item->get_ams_id() == ams_id) {
|
||||
item->OnSelected();
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -3343,7 +3343,7 @@ void AMSControl::UpdateAms(std::vector<AMSinfo> ams_info, std::vector<AMSinfo>ex
|
|||
}
|
||||
|
||||
for (auto ams_prv : m_ams_preview_list) {
|
||||
std::string id = ams_prv.second->m_amsinfo.ams_id;
|
||||
std::string id = ams_prv.second->get_ams_id();
|
||||
auto item = m_ams_item_list.find(id);
|
||||
if (item != m_ams_item_list.end())
|
||||
{ ams_prv.second->Update(item->second->get_ams_info());
|
||||
|
@ -3446,7 +3446,7 @@ void AMSControl::AddAmsPreview(AMSinfo info, AMSModel type)
|
|||
|
||||
if (ams_prv){
|
||||
ams_prv->Bind(wxEVT_LEFT_DOWN, [this, ams_prv](wxMouseEvent &e) {
|
||||
SwitchAms(ams_prv->m_amsinfo.ams_id);
|
||||
SwitchAms(ams_prv->get_ams_id());
|
||||
e.Skip();
|
||||
});
|
||||
m_ams_preview_list[info.ams_id] = ams_prv;
|
||||
|
@ -3665,14 +3665,14 @@ void AMSControl::AddAmsPreview(std::vector<AMSinfo>single_info, AMSPanelPos pos)
|
|||
|
||||
if (ams_prv) {
|
||||
ams_prv->Bind(wxEVT_LEFT_DOWN, [this, ams_prv](wxMouseEvent& e) {
|
||||
SwitchAms(ams_prv->m_amsinfo.ams_id);
|
||||
SwitchAms(ams_prv->get_ams_id());
|
||||
e.Skip();
|
||||
});
|
||||
m_ams_preview_list[single_info[0].ams_id] = ams_prv;
|
||||
}
|
||||
if (ams_prv2) {
|
||||
ams_prv2->Bind(wxEVT_LEFT_DOWN, [this, ams_prv2](wxMouseEvent& e) {
|
||||
SwitchAms(ams_prv2->m_amsinfo.ams_id);
|
||||
SwitchAms(ams_prv2->get_ams_id());
|
||||
e.Skip();
|
||||
});
|
||||
m_ams_preview_list[single_info[1].ams_id] = ams_prv2;
|
||||
|
@ -3696,7 +3696,7 @@ void AMSControl::SwitchAms(std::string ams_id)
|
|||
|
||||
for (auto prv_it : m_ams_preview_list) {
|
||||
AMSPreview* prv = prv_it.second;
|
||||
if (prv->m_amsinfo.ams_id == m_current_show_ams_left || prv->m_amsinfo.ams_id == m_current_show_ams_right) {
|
||||
if (prv->get_ams_id() == m_current_show_ams_left || prv->get_ams_id() == m_current_show_ams_right) {
|
||||
prv->OnSelected();
|
||||
m_current_select = ams_id;
|
||||
|
||||
|
@ -3722,11 +3722,10 @@ void AMSControl::SwitchAms(std::string ams_id)
|
|||
} else {
|
||||
prv->UnSelected();
|
||||
}
|
||||
if (prv->m_amsinfo.nozzle_id == DEPUTY_NOZZLE_ID) {
|
||||
if (prv->get_nozzle_id() == DEPUTY_NOZZLE_ID) {
|
||||
m_sizer_prv_left->Layout();
|
||||
m_panel_prv_left->Fit();
|
||||
}
|
||||
else if (prv->m_amsinfo.nozzle_id == MAIN_NOZZLE_ID){
|
||||
} else if (prv->get_nozzle_id() == MAIN_NOZZLE_ID) {
|
||||
m_sizer_prv_right->Layout();
|
||||
m_panel_prv_right->Fit();
|
||||
}
|
||||
|
|
|
@ -650,9 +650,13 @@ public:
|
|||
virtual bool Enable(bool enable = true);
|
||||
void msw_rescale();
|
||||
|
||||
AMSinfo m_amsinfo;
|
||||
|
||||
std::string get_ams_id() const { return m_amsinfo.ams_id; };
|
||||
int get_nozzle_id() const { return m_amsinfo.nozzle_id; };
|
||||
|
||||
protected:
|
||||
AMSinfo m_amsinfo;
|
||||
|
||||
wxSize m_cube_size;
|
||||
wxColour m_background_colour = { AMS_CONTROL_DEF_LIB_BK_COLOUR };
|
||||
float m_padding;
|
||||
|
|
Loading…
Reference in New Issue