From 19cb1dbe4d209333c09606b325aaba11cef358c9 Mon Sep 17 00:00:00 2001 From: tao wang Date: Fri, 5 Aug 2022 15:30:50 +0800 Subject: [PATCH] FIX:fixed amsitem is too close to Amslib Change-Id: I25a8b232a169cd0dcb0290490795192fa0b29aba --- src/slic3r/GUI/StatusPanel.cpp | 2 +- src/slic3r/GUI/Widgets/AMSControl.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index fde882a72..a36349fed 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -875,7 +875,7 @@ wxBoxSizer *StatusBasePanel::create_ams_group(wxWindow *parent) auto sizer = new wxBoxSizer(wxVERTICAL); auto sizer_box = new wxBoxSizer(wxVERTICAL); m_ams_control_box = new RoundedRectangle(parent, wxColour(0xEE, 0xEE, 0xEE), wxDefaultPosition, wxDefaultSize, 5, 1); - m_ams_control_box->SetMinSize(wxSize(FromDIP(530), FromDIP(286))); + m_ams_control_box->SetMinSize(wxSize(FromDIP(530), FromDIP(310))); m_ams_control_box->SetBackgroundColour(*wxWHITE); #if !BBL_RELEASE_TO_PUBLIC m_ams_debug = new wxStaticText(m_ams_control_box, wxID_ANY, _L("Debug Info"), wxDefaultPosition, wxDefaultSize, 0); diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp index 78bb9e3b0..a1e52f50f 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.cpp +++ b/src/slic3r/GUI/Widgets/AMSControl.cpp @@ -1418,13 +1418,15 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons m_button_extruder_feed->SetBorderColor(btn_bd_green); m_button_extruder_feed->SetTextColor(btn_text_green); m_button_extruder_feed->SetFont(Label::Body_13); - m_sizer_left_bottom->Add(m_button_extruder_feed, 0, wxTOP, FromDIP(0)); - m_sizer_left_bottom->Add(0, 0, 0, wxALL | wxLEFT, FromDIP(10)); + m_button_extruder_back = new Button(amswin, _L("Unload Filament")); m_button_extruder_back->SetBackgroundColor(btn_bg_white); m_button_extruder_back->SetBorderColor(btn_bd_white); m_button_extruder_back->SetFont(Label::Body_13); + + m_sizer_left_bottom->Add(m_button_extruder_feed, 0, wxTOP, FromDIP(20)); + m_sizer_left_bottom->Add(0, 0, 0, wxALL | wxLEFT, FromDIP(10)); m_sizer_left_bottom->Add(m_button_extruder_back, 0, wxTOP, FromDIP(20)); m_sizer_left->Add(m_sizer_left_bottom, 0, wxEXPAND, 0);