diff --git a/src/slic3r/GUI/MediaPlayCtrl.cpp b/src/slic3r/GUI/MediaPlayCtrl.cpp index 91a9718fb..bc22f2fcc 100644 --- a/src/slic3r/GUI/MediaPlayCtrl.cpp +++ b/src/slic3r/GUI/MediaPlayCtrl.cpp @@ -207,7 +207,10 @@ void MediaPlayCtrl::Play() } BOOST_LOG_TRIVIAL(info) << "MediaPlayCtrl camera_url: " << url << ", machine: " << m_machine; 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; if (m_last_state == MEDIASTATE_INITIALIZING) { if (url.empty() || !boost::algorithm::starts_with(url, "bambu:///")) { diff --git a/src/slic3r/GUI/ParamsPanel.cpp b/src/slic3r/GUI/ParamsPanel.cpp index 8e6ef3468..3b0ef8921 100644 --- a/src/slic3r/GUI/ParamsPanel.cpp +++ b/src/slic3r/GUI/ParamsPanel.cpp @@ -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_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_staticline_print_object) - m_left_sizer->Add( m_staticline_print_object, 0, wxEXPAND ); m_left_sizer->Add( m_tab_print_object, 0, wxEXPAND ); } 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 ); } @@ -409,8 +403,6 @@ void ParamsPanel::create_layout() } 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->Add( m_tab_filament, 1, wxEXPAND | wxALL, 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_staticline_printer) - m_left_sizer->Add( m_staticline_printer, 0, wxEXPAND ); //m_printer_sizer = new wxBoxSizer( wxVERTICAL ); //m_printer_sizer->Add( m_tab_printer, 1, wxEXPAND | wxALL, 5 ); m_left_sizer->Add( m_tab_printer, 0, wxEXPAND ); diff --git a/src/slic3r/GUI/Widgets/Label.cpp b/src/slic3r/GUI/Widgets/Label.cpp index dbbf41a8d..63916693a 100644 --- a/src/slic3r/GUI/Widgets/Label.cpp +++ b/src/slic3r/GUI/Widgets/Label.cpp @@ -234,7 +234,7 @@ Label::Label(wxWindow *parent, wxFont const &font, wxString const &text, long st { this->font = font; SetFont(font); - SetForegroundColour(wxColour("#262E30")); + SetForegroundColour(*wxBLACK); SetBackgroundColour(StaticBox::GetParentBackgroundColor(parent)); SetForegroundColour("#262E30"); if (style & LB_PROPAGATE_MOUSE_EVENT) {