Merge pull request #8976 from JosJuice/port-some-settings

Port some settings to the new config system
This commit is contained in:
LC
2020-09-07 22:37:46 -04:00
committed by GitHub
15 changed files with 68 additions and 68 deletions

View File

@ -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;