3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

FIX:fixed amsmapping button can not get click event on macos

Browse source 
Change-Id: I4816365a2857e3e40c805af0e94654a8684c155c
This commit is contained in:
tao wang 2022-07-19 21:31:27 +08:00 • committed by Lane.Wei
parent b9f22f2a04
commit 4d59db23e4
3 changed files with 187 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/slic3r/GUI/SelectMachine.cpp
View file

@ -1064,7 +1064,7 @@ void SelectMachineDialog::sync_ams_mapping_result(std::vector<FilamentInfo> &res
ams_col = AmsTray::decode_color(f->color);
} else {
// default color
ams_col = wxColour(0x6B, 0x6B, 0x6B);
ams_col = wxColour(0xEE, 0xEE, 0xEE);
}
m->set_ams_info(ams_col, ams_id);
@ -1950,6 +1950,10 @@ void SelectMachineDialog::set_default()
m_sizer_material->Add(item, 0, wxALL, FromDIP(4));
item->Bind(wxEVT_LEFT_UP, [this, item, materials, extruder](wxMouseEvent &e) {
});
item->Bind(wxEVT_LEFT_DOWN, [this, item, materials, extruder](wxMouseEvent &e) {
MaterialHash::iterator iter = m_materialList.begin();
while (iter != m_materialList.end()) {
int id = iter->first;
@ -1961,9 +1965,8 @@ void SelectMachineDialog::set_default()
m_current_filament_id = extruder;
item->on_selected();
});
item->Bind(wxEVT_LEFT_DOWN, [this, item, materials, extruder](wxMouseEvent &e) {
auto mouse_pos = ClientToScreen(e.GetPosition());
wxPoint rect = item->ClientToScreen(wxPoint(0, 0));
// update ams data