3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-22 20:42:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

FIX: make the AMS Preview area able to scroll

Browse source 
jira: [STUDIO-10502]
Change-Id: Ia720caa529636070b0ea2772fbe0f552b02e7060
(cherry picked from commit 6ec477b595fa12298571788ddfac51e06b33ac81)
This commit is contained in:
xin.zhang 2025-02-25 14:07:39 +08:00 • committed by Noisyfox
parent 967ef78229
commit 8ccd7b0cc6
2 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,7 +47,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);
@ -58,7 +59,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);
@ -1362,13 +1364,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) {

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

@ -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};