From 6ec477b595fa12298571788ddfac51e06b33ac81 Mon Sep 17 00:00:00 2001 From: "xin.zhang" Date: Tue, 25 Feb 2025 14:07:39 +0800 Subject: [PATCH] FIX: make the AMS Preview area able to scroll jira: [STUDIO-10502] Change-Id: Ia720caa529636070b0ea2772fbe0f552b02e7060 --- src/slic3r/GUI/Widgets/AMSControl.cpp | 13 ++++--------- src/slic3r/GUI/Widgets/AMSControl.hpp | 4 ++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp index 1f28cc17f..84c31b92b 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.cpp +++ b/src/slic3r/GUI/Widgets/AMSControl.cpp @@ -2444,7 +2444,8 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons m_sizer_ams_items = new wxBoxSizer(wxHORIZONTAL); /*right items*/ - m_panel_prv_left = new wxPanel(m_amswin, wxID_ANY); + m_panel_prv_left = new wxScrolledWindow(m_amswin, wxID_ANY); + m_panel_prv_left->SetScrollRate(10, 0); m_panel_prv_left->SetSize(AMS_ITEMS_PANEL_SIZE); m_panel_prv_left->SetMinSize(AMS_ITEMS_PANEL_SIZE); //m_panel_prv_left->SetBackgroundColour(0x4169E1); @@ -2455,7 +2456,8 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons //m_sizer_items_left->Fit(m_panel_prv_left); /*right items*/ - m_panel_prv_right = new wxPanel(m_amswin, wxID_ANY); + m_panel_prv_right = new wxScrolledWindow(m_amswin, wxID_ANY); + m_panel_prv_right->SetScrollRate(10, 0); m_panel_prv_right->SetSize(AMS_ITEMS_PANEL_SIZE); m_panel_prv_right->SetMinSize(AMS_ITEMS_PANEL_SIZE); //m_panel_prv_right->SetBackgroundColour(0x4169E1); @@ -3759,13 +3761,6 @@ void AMSControl::SwitchAms(std::string ams_id) } else { prv->UnSelected(); } - if (prv->get_nozzle_id() == DEPUTY_NOZZLE_ID) { - m_sizer_prv_left->Layout(); - m_panel_prv_left->Fit(); - } else if (prv->get_nozzle_id() == MAIN_NOZZLE_ID) { - m_sizer_prv_right->Layout(); - m_panel_prv_right->Fit(); - } } for (auto ams_item : m_ams_item_list) { diff --git a/src/slic3r/GUI/Widgets/AMSControl.hpp b/src/slic3r/GUI/Widgets/AMSControl.hpp index 20d867333..f63fd4899 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.hpp +++ b/src/slic3r/GUI/Widgets/AMSControl.hpp @@ -53,8 +53,8 @@ protected: /*items*/ wxBoxSizer* m_sizer_ams_items{nullptr}; - wxWindow* m_panel_prv_left {nullptr}; - wxWindow* m_panel_prv_right{nullptr}; + wxScrolledWindow* m_panel_prv_left {nullptr}; + wxScrolledWindow* m_panel_prv_right{nullptr}; wxBoxSizer* m_sizer_prv_left{nullptr}; wxBoxSizer* m_sizer_prv_right{nullptr};