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

Merge pull request #9492 from nolange/fix_norandr_build

Browse Source 
Cleanup X11 and XRANDR Macros
This commit is contained in:
Léo Lam
2021-03-01 11:36:39 +01:00
committed by GitHub
parent 26f0bf8f34 d4b293e969
commit 858f00b641
10 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinQt/MainWindow.cpp
View File

@ -119,7 +119,7 @@
#include "VideoCommon/NetPlayChatUI.h"
#include "VideoCommon/VideoConfig.h"
#if defined(HAVE_XRANDR) && HAVE_XRANDR
#ifdef HAVE_XRANDR
#include "UICommon/X11Utils.h"
// This #define within X11/X.h conflicts with our WiimoteSource enum.
#undef None
@ -1174,7 +1174,7 @@ void MainWindow::ShowGraphicsWindow()
{
if (!m_graphics_window)
{
#if defined(HAVE_XRANDR) && HAVE_XRANDR
#ifdef HAVE_XRANDR
if (GetWindowSystemType() == WindowSystemType::X11)
{
m_xrr_config = std::make_unique<X11Utils::XRRConfiguration>(
@ -1465,7 +1465,7 @@ void MainWindow::UpdateScreenSaverInhibition()
m_is_screensaver_inhibited = inhibit;
#if defined(HAVE_XRANDR) && HAVE_XRANDR
#ifdef HAVE_X11
if (GetWindowSystemType() == WindowSystemType::X11)
UICommon::InhibitScreenSaver(winId(), inhibit);
#else

2
Source/Core/DolphinQt/MainWindow.h
View File

@ -191,7 +191,7 @@ private:
void dropEvent(QDropEvent* event) override;
QSize sizeHint() const override;
#if defined(HAVE_XRANDR) && HAVE_XRANDR
#ifdef HAVE_XRANDR
std::unique_ptr<X11Utils::XRRConfiguration> m_xrr_config;
#endif