mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-07-26 12:22:32 +00:00
Merge branch 'main' into fix-height-calculation
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user