summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinNoGUI
diff options
context:
space:
mode:
authorAdmiral H. Curtiss <pikachu025@gmail.com>2021-12-31 03:00:39 +0100
committerAdmiral H. Curtiss <pikachu025@gmail.com>2021-12-31 17:40:04 +0100
commitd6331c1e71ac28317bf1a7af36cfad2f2af05ca3 (patch)
tree2601495b508d4013235e7d8af6d7190697a3e579 /Source/Core/DolphinNoGUI
parentdf0870f79d28806886df50d5245c85997fb72b1f (diff)
Config: Port remaining Interface settings to new config system.
Diffstat (limited to 'Source/Core/DolphinNoGUI')
-rw-r--r--Source/Core/DolphinNoGUI/PlatformX11.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/Source/Core/DolphinNoGUI/PlatformX11.cpp b/Source/Core/DolphinNoGUI/PlatformX11.cpp
index 4ba2c1b3b9..27d3ca120c 100644
--- a/Source/Core/DolphinNoGUI/PlatformX11.cpp
+++ b/Source/Core/DolphinNoGUI/PlatformX11.cpp
@@ -13,7 +13,6 @@ static constexpr auto X_None = None;
#include "Common/MsgHandler.h"
#include "Core/Config/MainSettings.h"
-#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/State.h"
@@ -70,7 +69,7 @@ PlatformX11::~PlatformX11()
if (m_display)
{
- if (SConfig::GetInstance().m_show_cursor == SConfig::ShowCursor::Never)
+ if (Config::Get(Config::MAIN_SHOW_CURSOR) == Config::ShowCursor::Never)
XFreeCursor(m_display, m_blank_cursor);
XCloseDisplay(m_display);
@@ -115,7 +114,7 @@ bool PlatformX11::Init()
m_xrr_config = new X11Utils::XRRConfiguration(m_display, m_window);
#endif
- if (SConfig::GetInstance().m_show_cursor == SConfig::ShowCursor::Never)
+ if (Config::Get(Config::MAIN_SHOW_CURSOR) == Config::ShowCursor::Never)
{
// make a blank cursor
Pixmap Blank;
@@ -200,13 +199,13 @@ void PlatformX11::ProcessEvents()
{
if (Core::GetState() == Core::State::Running)
{
- if (SConfig::GetInstance().m_show_cursor == SConfig::ShowCursor::Never)
+ if (Config::Get(Config::MAIN_SHOW_CURSOR) == Config::ShowCursor::Never)
XUndefineCursor(m_display, m_window);
Core::SetState(Core::State::Paused);
}
else
{
- if (SConfig::GetInstance().m_show_cursor == SConfig::ShowCursor::Never)
+ if (Config::Get(Config::MAIN_SHOW_CURSOR) == Config::ShowCursor::Never)
XDefineCursor(m_display, m_window, m_blank_cursor);
Core::SetState(Core::State::Running);
}
@@ -243,7 +242,7 @@ void PlatformX11::ProcessEvents()
case FocusIn:
{
m_window_focus = true;
- if (SConfig::GetInstance().m_show_cursor == SConfig::ShowCursor::Never &&
+ if (Config::Get(Config::MAIN_SHOW_CURSOR) == Config::ShowCursor::Never &&
Core::GetState() != Core::State::Paused)
XDefineCursor(m_display, m_window, m_blank_cursor);
}
@@ -251,7 +250,7 @@ void PlatformX11::ProcessEvents()
case FocusOut:
{
m_window_focus = false;
- if (SConfig::GetInstance().m_show_cursor == SConfig::ShowCursor::Never)
+ if (Config::Get(Config::MAIN_SHOW_CURSOR) == Config::ShowCursor::Never)
XUndefineCursor(m_display, m_window);
}
break;