juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-09 10:16:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH: support scroll while using AMS mapping

Browse Source 
jira: [STUDIO-11895]
Change-Id: I5cefd4e0cc6f5b7d6d1e1eaccfd2035bdd1a948e
(cherry picked from commit f2812461e31bb9b9e1f7740d10e103e85e4f1f25)
This commit is contained in:
xin.zhang
2025-05-14 17:21:04 +08:00
committed by Noisyfox
parent 6bd99609d8
commit ea98914bd0
3 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -211,8 +211,11 @@ class AmsMapingPopup : public PopupWindow
bool m_ext_mapping_filatype_check = true;
wxStaticText* m_title_text{ nullptr };
bool m_enable_vscroll = false;/*STUDIO-11895*/
wxScrolledWindow* m_scroll_area{ nullptr };
public:
AmsMapingPopup(wxWindow *parent,bool use_in_sync_dialog = false);
AmsMapingPopup(wxWindow *parent,bool use_in_sync_dialog = false, bool enable_vscroll = false);
~AmsMapingPopup() {};
MaterialItem* m_parent_item{ nullptr };
@@ -228,7 +231,7 @@ public:
int m_current_filament_id;
ShowType m_show_type{ShowType::RIGHT};
std::string m_tag_material;
wxBoxSizer *m_sizer_main{nullptr};
wxBoxSizer *m_sizer_scroll_main{nullptr};
wxBoxSizer *m_sizer_ams{nullptr};
wxBoxSizer *m_sizer_ams_left{nullptr};
wxBoxSizer *m_sizer_ams_right{nullptr};