diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2019-11-28 15:03:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-28 15:03:23 -0800 |
| commit | 4a0611df5472ea58af2f7960c8fc91db56c68d5f (patch) | |
| tree | 3fc7a9c466cbecdaca0721e6e5d56869fd13ba4b /Source/Core/VideoCommon/OnScreenDisplay.cpp | |
| parent | b5656df7e8c397474a00e7f64822e56bcdf826b6 (diff) | |
| parent | 6fbbc2683eeedf3767ea3d741c62555a30d3ff45 (diff) | |
Merge pull request #8487 from lioncash/video-fmt
VideoCommon: Make use of fmt outside of shader generators
Diffstat (limited to 'Source/Core/VideoCommon/OnScreenDisplay.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/OnScreenDisplay.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/VideoCommon/OnScreenDisplay.cpp b/Source/Core/VideoCommon/OnScreenDisplay.cpp index 0fb4a55a18..35e35b217f 100644 --- a/Source/Core/VideoCommon/OnScreenDisplay.cpp +++ b/Source/Core/VideoCommon/OnScreenDisplay.cpp @@ -2,21 +2,21 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "VideoCommon/OnScreenDisplay.h" + #include <algorithm> #include <map> #include <mutex> #include <string> +#include <fmt/format.h> #include <imgui.h> #include "Common/CommonTypes.h" -#include "Common/StringUtil.h" #include "Common/Timer.h" #include "Core/ConfigManager.h" -#include "VideoCommon/OnScreenDisplay.h" - namespace OSD { constexpr float LEFT_MARGIN = 10.0f; // Pixels to the left of OSD messages. @@ -49,7 +49,7 @@ static float DrawMessage(int index, const Message& msg, const ImVec2& position, { // We have to provide a window name, and these shouldn't be duplicated. // So instead, we generate a name based on the number of messages drawn. - const std::string window_name = StringFromFormat("osd_%d", index); + const std::string window_name = fmt::format("osd_{}", index); // The size must be reset, otherwise the length of old messages could influence new ones. ImGui::SetNextWindowPos(position); |
