franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6316 from ameerj/title-fix

Browse Source 
main: Add running title's version to window name on EA/mainline
This commit is contained in:
bunnei 2021-05-15 22:40:35 -07:00 committed by GitHub
commit 06c410ee88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/yuzu/main.cpp
View File

@ -2751,24 +2751,19 @@ void GMainWindow::MigrateConfigFiles() {
void GMainWindow::UpdateWindowTitle(const std::string& title_name, void GMainWindow::UpdateWindowTitle(const std::string& title_name,
const std::string& title_version) { const std::string& title_version) {
const auto full_name = std::string(Common::g_build_fullname);
const auto branch_name = std::string(Common::g_scm_branch); const auto branch_name = std::string(Common::g_scm_branch);
const auto description = std::string(Common::g_scm_desc); const auto description = std::string(Common::g_scm_desc);
const auto build_id = std::string(Common::g_build_id); const auto build_id = std::string(Common::g_build_id);
const auto date = const auto yuzu_title = fmt::format("yuzu | {}-{}", branch_name, description);
QDateTime::currentDateTime().toString(QStringLiteral("yyyy-MM-dd")).toStdString(); const auto override_title = fmt::format(std::string(Common::g_title_bar_format_idle), build_id);
const auto window_title = override_title.empty() ? yuzu_title : override_title;
if (title_name.empty()) { if (title_name.empty()) {
const auto fmt = std::string(Common::g_title_bar_format_idle); setWindowTitle(QString::fromStdString(window_title));
setWindowTitle(QString::fromStdString(fmt::format(fmt.empty() ? "yuzu {0}| {1}-{2}" : fmt,
full_name, branch_name, description,
std::string{}, date, build_id)));
} else { } else {
const auto fmt = std::string(Common::g_title_bar_format_running); const auto run_title = fmt::format("{} | {} | {}", window_title, title_name, title_version);
setWindowTitle(QString::fromStdString( setWindowTitle(QString::fromStdString(run_title));
fmt::format(fmt.empty() ? "yuzu {0}| {3} | {6} | {1}-{2}" : fmt, full_name, branch_name,
description, title_name, date, build_id, title_version)));
} }
} }