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

FIX: sync from master 

Change-Id: If8d11f0778d540e7f16ce022150bc531d42f6bd9
This commit is contained in:
chunmao.guo 2023-05-30 12:16:37 +08:00 committed by Lane.Wei
parent 2d8ddca1d6
commit a12e1f2568
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/slic3r/GUI/MediaPlayCtrl.cpp
View File

@ -207,7 +207,10 @@ void MediaPlayCtrl::Play()
} }
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl camera_url: " << url << ", machine: " << m_machine; BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl camera_url: " << url << ", machine: " << m_machine;
CallAfter([this, m, url] { CallAfter([this, m, url] {
if (m != m_machine) return; if (m != m_machine) {
BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl drop late ttcode for machine: " << m;
return;
}
m_url = url; m_url = url;
if (m_last_state == MEDIASTATE_INITIALIZING) { if (m_last_state == MEDIASTATE_INITIALIZING) {
if (url.empty() || !boost::algorithm::starts_with(url, "bambu:///")) { if (url.empty() || !boost::algorithm::starts_with(url, "bambu:///")) {

10
src/slic3r/GUI/ParamsPanel.cpp
View File

@ -248,8 +248,6 @@ ParamsPanel::ParamsPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, c
}); });
} }
//m_export_to_file = new Button( this, wxT("Export To File"), ""); //m_export_to_file = new Button( this, wxT("Export To File"), "");
//m_import_from_file = new Button( this, wxT("Import From File") ); //m_import_from_file = new Button( this, wxT("Import From File") );
@ -393,14 +391,10 @@ void ParamsPanel::create_layout()
} }
if (m_tab_print_object) { if (m_tab_print_object) {
if (m_staticline_print_object)
m_left_sizer->Add( m_staticline_print_object, 0, wxEXPAND );
m_left_sizer->Add( m_tab_print_object, 0, wxEXPAND ); m_left_sizer->Add( m_tab_print_object, 0, wxEXPAND );
} }
if (m_tab_print_part) { if (m_tab_print_part) {
if (m_staticline_print_part)
m_left_sizer->Add( m_staticline_print_part, 0, wxEXPAND );
m_left_sizer->Add( m_tab_print_part, 0, wxEXPAND ); m_left_sizer->Add( m_tab_print_part, 0, wxEXPAND );
} }
@ -409,8 +403,6 @@ void ParamsPanel::create_layout()
} }
if (m_tab_filament) { if (m_tab_filament) {
if (m_staticline_filament)
m_left_sizer->Add(m_staticline_filament, 0, wxEXPAND);
//m_filament_sizer = new wxBoxSizer( wxVERTICAL ); //m_filament_sizer = new wxBoxSizer( wxVERTICAL );
//m_filament_sizer->Add( m_tab_filament, 1, wxEXPAND | wxALL, 5 ); //m_filament_sizer->Add( m_tab_filament, 1, wxEXPAND | wxALL, 5 );
// m_left_sizer->Add( m_filament_sizer, 1, wxEXPAND, 5 ); // m_left_sizer->Add( m_filament_sizer, 1, wxEXPAND, 5 );
@ -418,8 +410,6 @@ void ParamsPanel::create_layout()
} }
if (m_tab_printer) { if (m_tab_printer) {
if (m_staticline_printer)
m_left_sizer->Add( m_staticline_printer, 0, wxEXPAND );
//m_printer_sizer = new wxBoxSizer( wxVERTICAL ); //m_printer_sizer = new wxBoxSizer( wxVERTICAL );
//m_printer_sizer->Add( m_tab_printer, 1, wxEXPAND | wxALL, 5 ); //m_printer_sizer->Add( m_tab_printer, 1, wxEXPAND | wxALL, 5 );
m_left_sizer->Add( m_tab_printer, 0, wxEXPAND ); m_left_sizer->Add( m_tab_printer, 0, wxEXPAND );

2
src/slic3r/GUI/Widgets/Label.cpp
View File

@ -234,7 +234,7 @@ Label::Label(wxWindow *parent, wxFont const &font, wxString const &text, long st
{ {
this->font = font; this->font = font;
SetFont(font); SetFont(font);
SetForegroundColour(wxColour("#262E30")); SetForegroundColour(*wxBLACK);
SetBackgroundColour(StaticBox::GetParentBackgroundColor(parent)); SetBackgroundColour(StaticBox::GetParentBackgroundColor(parent));
SetForegroundColour("#262E30"); SetForegroundColour("#262E30");
if (style & LB_PROPAGATE_MOUSE_EVENT) { if (style & LB_PROPAGATE_MOUSE_EVENT) {