diff options
| author | JosJuice <josjuice@gmail.com> | 2020-07-20 11:22:53 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2020-08-03 15:07:53 +0200 |
| commit | b0f9bb9f136053c3fb164704e4d34a0ab0dd5dea (patch) | |
| tree | 4cd53e8a7e68653d25a4f130ea79367e76e73203 /Source/Core/VideoCommon/OnScreenDisplay.cpp | |
| parent | 25ebc3c07c6310924d662b2209f9ba5d08006ea6 (diff) | |
Port some settings to the new config system
Other than the controller settings and JIT debug settings,
these are the only settings which were defined in Java code
but not defined in the new config system in C++. (There are
still a lot of settings that are defined in the new config
system but not yet saveable in the new config system, though.)
Diffstat (limited to 'Source/Core/VideoCommon/OnScreenDisplay.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/OnScreenDisplay.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/OnScreenDisplay.cpp b/Source/Core/VideoCommon/OnScreenDisplay.cpp index 359e17ebb0..e08bfb0970 100644 --- a/Source/Core/VideoCommon/OnScreenDisplay.cpp +++ b/Source/Core/VideoCommon/OnScreenDisplay.cpp @@ -13,9 +13,10 @@ #include <imgui.h> #include "Common/CommonTypes.h" +#include "Common/Config/Config.h" #include "Common/Timer.h" -#include "Core/ConfigManager.h" +#include "Core/Config/MainSettings.h" namespace OSD { @@ -94,7 +95,7 @@ void AddMessage(std::string message, u32 ms, u32 argb) void DrawMessages() { - const bool draw_messages = SConfig::GetInstance().bOnScreenDisplayMessages; + const bool draw_messages = Config::Get(Config::MAIN_OSD_MESSAGES); const u32 now = Common::Timer::GetTimeMs(); const float current_x = LEFT_MARGIN * ImGui::GetIO().DisplayFramebufferScale.x; float current_y = TOP_MARGIN * ImGui::GetIO().DisplayFramebufferScale.y; |