piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Simplify macro guards for HAVE_XRANDR

Browse Source
This commit is contained in:
Norbert Lange
2021-02-22 14:32:53 +01:00
parent 29eaf09be4
commit d4b293e969
7 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DolphinNoGUI/PlatformX11.cpp
View File

@ -48,7 +48,7 @@ private:
Display* m_display = nullptr;
Window m_window = {};
Cursor m_blank_cursor = None;
#if defined(HAVE_XRANDR) && HAVE_XRANDR
#ifdef HAVE_XRANDR
X11Utils::XRRConfiguration* m_xrr_config = nullptr;
#endif
int m_window_x = Config::Get(Config::MAIN_RENDER_WINDOW_XPOS);
@ -59,7 +59,7 @@ private:
PlatformX11::~PlatformX11()
{
#if defined(HAVE_XRANDR) && HAVE_XRANDR
#ifdef HAVE_XRANDR
delete m_xrr_config;
#endif
@ -106,7 +106,7 @@ bool PlatformX11::Init()
if (Config::Get(Config::MAIN_DISABLE_SCREENSAVER))
X11Utils::InhibitScreensaver(m_window, true);
#if defined(HAVE_XRANDR) && HAVE_XRANDR
#ifdef HAVE_XRANDR
m_xrr_config = new X11Utils::XRRConfiguration(m_display, m_window);
#endif
@ -126,7 +126,7 @@ bool PlatformX11::Init()
if (Config::Get(Config::MAIN_FULLSCREEN))
{
m_window_fullscreen = X11Utils::ToggleFullscreen(m_display, m_window);
#if defined(HAVE_XRANDR) && HAVE_XRANDR
#ifdef HAVE_XRANDR
m_xrr_config->ToggleDisplayMode(True);
#endif
ProcessEvents();
@ -210,7 +210,7 @@ void PlatformX11::ProcessEvents()
{
m_window_fullscreen = !m_window_fullscreen;
X11Utils::ToggleFullscreen(m_display, m_window);
#if defined(HAVE_XRANDR) && HAVE_XRANDR
#ifdef HAVE_XRANDR
m_xrr_config->ToggleDisplayMode(m_window_fullscreen);
#endif
UpdateWindowPosition();