Merge branch 'main' into fix-height-calculation

This commit is contained in:
yw4z
2026-03-09 20:02:23 +03:00
committed by GitHub
91 changed files with 10696 additions and 6019 deletions

View File

@@ -10421,13 +10421,13 @@ void Plater::priv::set_project_name(const wxString& project_name)
BOOST_LOG_TRIVIAL(trace) << __FUNCTION__ << __LINE__ << " project is:" << project_name;
m_project_name = project_name;
//update topbar title
#ifdef __WINDOWS__
wxGetApp().mainframe->SetTitle(m_project_name + " - OrcaSlicer");
wxGetApp().mainframe->topbar()->SetTitle(m_project_name);
#else
#ifdef __APPLE__
wxGetApp().mainframe->SetTitle(m_project_name);
if (!m_project_name.IsEmpty())
wxGetApp().mainframe->update_title_colour_after_set_title();
#else
wxGetApp().mainframe->SetTitle(m_project_name + " - OrcaSlicer");
wxGetApp().mainframe->topbar()->SetTitle(m_project_name);
#endif
}
@@ -10442,11 +10442,12 @@ void Plater::priv::update_title_dirty_status()
else
title = m_project_name;
#ifdef __WINDOWS__
wxGetApp().mainframe->topbar()->SetTitle(title);
#ifdef __APPLE__
wxGetApp().mainframe->SetTitle(title);
wxGetApp().mainframe->update_title_colour_after_set_title();
#else
wxGetApp().mainframe->SetTitle(title);
wxGetApp().mainframe->update_title_colour_after_set_title();
wxGetApp().mainframe->topbar()->SetTitle(title);
#endif
}