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

FIX:Fixed incomplete display of AMS tips on Mac OS 

jira:STUDIO-4132[STUDIO-4132]

Change-Id: I062f2e7fdf3b89a67b19f70e2ac7606816e03baf
This commit is contained in:
tao wang 2023-10-24 17:16:05 +08:00 committed by Lane.Wei
parent 519e8a7fe7
commit e3b1c13c65
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)

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

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