Bix/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2025-10-22 17:27:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6517 from lioncash/fmtlib

Browse source 
externals: Update fmt to 8.0.0
This commit is contained in:
bunnei 2021-06-23 15:31:04 -07:00 • committed by GitHub
commit 1f0bb8bad2
11 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/yuzu/about_dialog.cpp
View file

@ -14,7 +14,8 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent), ui(new Ui::AboutDia
const auto build_id = std::string(Common::g_build_id);
const auto yuzu_build = fmt::format("yuzu Development Build | {}-{}", branch_name, description);
const auto override_build = fmt::format(std::string(Common::g_title_bar_format_idle), build_id);
const auto override_build =
fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id);
const auto yuzu_build_version = override_build.empty() ? yuzu_build : override_build;
ui->setupUi(this);

6
src/yuzu/main.cpp
View file

@ -236,7 +236,8 @@ GMainWindow::GMainWindow()
const auto build_id = std::string(Common::g_build_id);
const auto yuzu_build = fmt::format("yuzu Development Build | {}-{}", branch_name, description);
const auto override_build = fmt::format(std::string(Common::g_title_bar_format_idle), build_id);
const auto override_build =
fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id);
const auto yuzu_build_version = override_build.empty() ? yuzu_build : override_build;
LOG_INFO(Frontend, "yuzu Version: {}", yuzu_build_version);
@ -2858,7 +2859,8 @@ void GMainWindow::UpdateWindowTitle(const std::string& title_name,
const auto build_id = std::string(Common::g_build_id);
const auto yuzu_title = fmt::format("yuzu | {}-{}", branch_name, description);
const auto override_title = fmt::format(std::string(Common::g_title_bar_format_idle), build_id);
const auto override_title =
fmt::format(fmt::runtime(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()) {