From e3b1c13c65ce55e1b2d69232bf36d277f6db2247 Mon Sep 17 00:00:00 2001 From: tao wang Date: Tue, 24 Oct 2023 17:16:05 +0800 Subject: [PATCH] FIX:Fixed incomplete display of AMS tips on Mac OS jira:STUDIO-4132[STUDIO-4132] Change-Id: I062f2e7fdf3b89a67b19f70e2ac7606816e03baf --- src/slic3r/GUI/Widgets/AMSControl.cpp | 8 +++++--- src/slic3r/GUI/Widgets/AMSControl.hpp | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp index e8693e54c..537e6b10b 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.cpp +++ b/src/slic3r/GUI/Widgets/AMSControl.cpp @@ -2589,8 +2589,9 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons m_tip_right_top->Wrap(AMS_STEP_SIZE.x); - m_tip_load_info = new wxStaticText(tip_right, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0); + m_tip_load_info = new ::Label(tip_right, wxEmptyString); m_tip_load_info->SetFont(::Label::Body_13); + m_tip_load_info->SetBackgroundColour(*wxWHITE); m_tip_load_info->SetForegroundColour(AMS_CONTROL_GRAY700); m_sizer_right_tip->Add(m_tip_right_top, 0, 0, 0); @@ -3448,9 +3449,10 @@ void AMSControl::ShowFilamentTip(bool hasams) m_tip_right_top->Hide(); m_tip_load_info->SetLabelText(wxEmptyString); } - m_sizer_right_tip->Layout(); - m_tip_load_info->Wrap(AMS_STEP_SIZE.x); + m_tip_load_info->SetMinSize(AMS_STEP_SIZE); + m_tip_load_info->Wrap(AMS_STEP_SIZE.x - FromDIP(5)); + m_sizer_right_tip->Layout(); } bool AMSControl::Enable(bool enable) diff --git a/src/slic3r/GUI/Widgets/AMSControl.hpp b/src/slic3r/GUI/Widgets/AMSControl.hpp index 090788eef..3230dead9 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.hpp +++ b/src/slic3r/GUI/Widgets/AMSControl.hpp @@ -591,7 +591,7 @@ protected: wxSimplebook *m_simplebook_bottom = {nullptr}; wxStaticText *m_tip_right_top = {nullptr}; - wxStaticText *m_tip_load_info = {nullptr}; + Label *m_tip_load_info = {nullptr}; wxStaticText *m_text_calibration_percent = {nullptr}; wxWindow * m_none_ams_panel = {nullptr}; wxWindow * m_panel_top = {nullptr};