mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: make the AMS Preview area able to scroll 

jira: [STUDIO-10502]
Change-Id: Ia720caa529636070b0ea2772fbe0f552b02e7060
This commit is contained in:
xin.zhang 2025-02-25 14:07:39 +08:00 committed by lane.wei
parent 4c8779d85c
commit 6ec477b595
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/slic3r/GUI/Widgets/AMSControl.cpp
View File

@ -2444,7 +2444,8 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons
m_sizer_ams_items = new wxBoxSizer(wxHORIZONTAL); m_sizer_ams_items = new wxBoxSizer(wxHORIZONTAL);
/*right items*/ /*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->SetSize(AMS_ITEMS_PANEL_SIZE);
m_panel_prv_left->SetMinSize(AMS_ITEMS_PANEL_SIZE); m_panel_prv_left->SetMinSize(AMS_ITEMS_PANEL_SIZE);
//m_panel_prv_left->SetBackgroundColour(0x4169E1); //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); //m_sizer_items_left->Fit(m_panel_prv_left);
/*right items*/ /*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->SetSize(AMS_ITEMS_PANEL_SIZE);
m_panel_prv_right->SetMinSize(AMS_ITEMS_PANEL_SIZE); m_panel_prv_right->SetMinSize(AMS_ITEMS_PANEL_SIZE);
//m_panel_prv_right->SetBackgroundColour(0x4169E1); //m_panel_prv_right->SetBackgroundColour(0x4169E1);
@ -3759,13 +3761,6 @@ void AMSControl::SwitchAms(std::string ams_id)
} else { } else {
prv->UnSelected(); 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) { for (auto ams_item : m_ams_item_list) {

4
src/slic3r/GUI/Widgets/AMSControl.hpp
View File

@ -53,8 +53,8 @@ protected:
/*items*/ /*items*/
wxBoxSizer* m_sizer_ams_items{nullptr}; wxBoxSizer* m_sizer_ams_items{nullptr};
wxWindow* m_panel_prv_left {nullptr}; wxScrolledWindow* m_panel_prv_left {nullptr};
wxWindow* m_panel_prv_right{nullptr}; wxScrolledWindow* m_panel_prv_right{nullptr};
wxBoxSizer* m_sizer_prv_left{nullptr}; wxBoxSizer* m_sizer_prv_left{nullptr};
wxBoxSizer* m_sizer_prv_right{nullptr}; wxBoxSizer* m_sizer_prv_right{nullptr};