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

ENH: Revert "ENH: support scroll while using AMS mapping"

Browse Source 
This reverts commit e6f290b29d4de697d492a2d933a447ad580a9e83.

jira: [STUDIO-11895]
Change-Id: Iab14bba06cfe59c4804ab9cf2d9784ea75bfe4b7
(cherry picked from commit 529687a2d2d5a4782c941a66eabec704548262df)
This commit is contained in:
xin.zhang
2025-05-19 14:51:19 +08:00
committed by Noisyfox
parent db3ea45e82
commit f21c5f9ee6
3 changed files with 13 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -211,11 +211,8 @@ 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, bool enable_vscroll = false);
AmsMapingPopup(wxWindow *parent,bool use_in_sync_dialog = false);
~AmsMapingPopup() {};
MaterialItem* m_parent_item{ nullptr };
@@ -231,7 +228,7 @@ public:
int m_current_filament_id;
ShowType m_show_type{ShowType::RIGHT};
std::string m_tag_material;
wxBoxSizer *m_sizer_scroll_main{nullptr};
wxBoxSizer *m_sizer_main{nullptr};
wxBoxSizer *m_sizer_ams{nullptr};
wxBoxSizer *m_sizer_ams_left{nullptr};
wxBoxSizer *m_sizer_ams_right{nullptr};