3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 23:46:24 -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

22
src/slic3r/GUI/AmsMappingPopup.hpp
View file

@ -85,6 +85,24 @@ public:
void doRender(wxDC &dc);
};
class MappingItem : public wxPanel
{
public:
MappingItem(wxWindow *parent);
~MappingItem();
void update_data(TrayData data);
void send_event(int fliament_id);
wxColour m_coloul;
wxString m_name;
TrayData m_tray_data;
void msw_rescale();
void paintEvent(wxPaintEvent &evt);
void render(wxDC &dc);
void set_data(wxColour colour, wxString name, TrayData data);
void doRender(wxDC &dc);
};
class AmsMapingPopup : public wxPopupTransientWindow
{
@ -94,6 +112,7 @@ public:
std::vector<std::string> m_materials_list;
std::vector<wxBoxSizer*> m_amsmapping_sizer_list;
std::vector<MappingItem*> m_mapping_item_list;
int m_current_filament_id;
std::string m_tag_material;
@ -105,7 +124,8 @@ public:
void add_ams_mapping(std::vector<TrayData> tray_data);
void set_current_filament_id(int id){m_current_filament_id = id;};
int get_current_filament_id(){return m_current_filament_id;};
bool is_match_material(int id, std::string material);
bool is_match_material(std::string material);
void on_left_down(wxMouseEvent &evt);
virtual void OnDismiss() wxOVERRIDE;
virtual bool ProcessLeftDown(wxMouseEvent &event) wxOVERRIDE;
void paintEvent(wxPaintEvent &evt);