juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-29 13:52:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH:adjust the UI of the Mapping pop-up window

Browse Source 
jira:[none]

Change-Id: I26f07db9a9d4fd565fde1e58d01e2c60380f8492
(cherry picked from commit 8f11826bc0d845d13489487fc647758d1e1f4565)
This commit is contained in:
tao wang
2025-01-18 12:41:12 +08:00
committed by Noisyfox
parent a90639130a
commit d5e1689d8b
4 changed files with 67 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,9 +91,11 @@ public:
ScalableBitmap m_arraw_bitmap_white;
ScalableBitmap m_transparent_mitem;
ScalableBitmap m_ams_wheel_mitem;
ScalableBitmap m_ams_not_match;
bool m_selected {false};
bool m_warning{false};
bool m_match {true};
void msw_rescale();
void set_ams_info(wxColour col, wxString txt, int ctype=0, std::vector<wxColour> cols= std::vector<wxColour>());
@@ -107,6 +109,7 @@ public:
void on_left_down(wxMouseEvent &evt);
void paintEvent(wxPaintEvent &evt);
void render(wxDC &dc);
void match(bool mat);
void doRender(wxDC &dc);
};
@@ -156,7 +159,7 @@ public:
~AmsMapingPopup() {};
wxWindow* send_win{ nullptr };
wxStaticText * m_warning_text{nullptr};
Label* m_warning_text{nullptr};
std::vector<std::string> m_materials_list;
std::vector<wxBoxSizer*> m_amsmapping_container_sizer_list;
std::vector<wxWindow*> m_amsmapping_container_list;
@@ -181,6 +184,7 @@ public:
wxPanel* m_left_marea_panel;
wxPanel* m_right_marea_panel;
wxBoxSizer * m_left_split_ams_sizer{nullptr};
wxBoxSizer * m_right_split_ams_sizer{nullptr};
wxBoxSizer* m_sizer_split_ams_left;
@@ -188,7 +192,6 @@ public:
void set_sizer_title(wxBoxSizer *sizer, wxString text);
wxBoxSizer* create_split_sizer(wxWindow* parent, wxString text);
wxString format_text(wxString &m_msg);
void set_send_win(wxWindow* win) {send_win = win;};
void update_materials_list(std::vector<std::string> list);
void set_tag_texture(std::string texture);