From 03e1bd0995c5e77d954067653716fd72b7579c95 Mon Sep 17 00:00:00 2001 From: Jules Blok Date: Thu, 9 Oct 2014 11:30:26 +0200 Subject: [PATCH] Limit Borderless Fullscreen to Windows systems. --- Source/Core/DolphinWX/Frame.cpp | 4 ++++ Source/Core/DolphinWX/VideoConfigDiag.cpp | 2 ++ 2 files changed, 6 insertions(+) diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index b101357d02..dc44ef5d70 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -187,19 +187,23 @@ WXLRESULT CRenderFrame::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPa bool CRenderFrame::ShowFullScreen(bool show, long style) { +#if defined WIN32 if (show && !g_Config.bBorderlessFullscreen) { // OpenGL requires the pop-up style to activate exclusive mode. SetWindowStyle((GetWindowStyle() & ~wxDEFAULT_FRAME_STYLE) | wxPOPUP_WINDOW); } +#endif bool result = wxTopLevelWindow::ShowFullScreen(show, style); +#if defined WIN32 if (!show) { // Restore the default style. SetWindowStyle((GetWindowStyle() & ~wxPOPUP_WINDOW) | wxDEFAULT_FRAME_STYLE); } +#endif return result; } diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp index a12771ae0b..1c349f3a7b 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp @@ -588,9 +588,11 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con szr_misc->Add(progressive_scan_checkbox); } +#if defined WIN32 // Borderless Fullscreen borderless_fullscreen = CreateCheckBox(page_advanced, _("Borderless Fullscreen"), wxGetTranslation(borderless_fullscreen_desc), vconfig.bBorderlessFullscreen); szr_misc->Add(borderless_fullscreen); +#endif wxStaticBoxSizer* const group_misc = new wxStaticBoxSizer(wxVERTICAL, page_advanced, _("Misc")); szr_advanced->Add(group_misc, 0, wxEXPAND | wxALL, 5);