mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 05:08:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
commit b350cf043b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 68 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/Core/VideoCommon/OnScreenDisplay.cpp
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;