ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

My OCD will not stand for this.

This commit is contained in:
Rachel Bryk 2013-03-15 15:41:13 -04:00
parent d63d7fde9e
commit 8767b30f75
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -75,12 +75,12 @@ Core::GetWindowHandle().
#include <wx/datetime.h> // wxWidgets #include <wx/datetime.h> // wxWidgets
#ifdef _WIN32 #ifdef _WIN32
#ifndef SM_YVIRTUALSCREEN
#define SM_YVIRTUALSCREEN 77
#endif
#ifndef SM_XVIRTUALSCREEN #ifndef SM_XVIRTUALSCREEN
#define SM_XVIRTUALSCREEN 76 #define SM_XVIRTUALSCREEN 76
#endif #endif
#ifndef SM_YVIRTUALSCREEN
#define SM_YVIRTUALSCREEN 77
#endif
#ifndef SM_CXVIRTUALSCREEN #ifndef SM_CXVIRTUALSCREEN
#define SM_CXVIRTUALSCREEN 78 #define SM_CXVIRTUALSCREEN 78
#endif #endif
@ -879,10 +879,10 @@ void CFrame::StartGame(const std::string& filename)
SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight); SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight);
#ifdef _WIN32 #ifdef _WIN32
// Out of desktop check // Out of desktop check
int height = GetSystemMetrics(SM_CYVIRTUALSCREEN);
int width = GetSystemMetrics(SM_CXVIRTUALSCREEN);
int leftPos = GetSystemMetrics(SM_XVIRTUALSCREEN); int leftPos = GetSystemMetrics(SM_XVIRTUALSCREEN);
int topPos = GetSystemMetrics(SM_YVIRTUALSCREEN); int topPos = GetSystemMetrics(SM_YVIRTUALSCREEN);
int width = GetSystemMetrics(SM_CXVIRTUALSCREEN);
int height = GetSystemMetrics(SM_CYVIRTUALSCREEN);
if ((leftPos + width) < (position.x + size.GetWidth()) || leftPos > position.x || (topPos + height) < (position.y + size.GetHeight()) || topPos > position.y) if ((leftPos + width) < (position.x + size.GetWidth()) || leftPos > position.x || (topPos + height) < (position.y + size.GetHeight()) || topPos > position.y)
position.x = position.y = wxDefaultCoord; position.x = position.y = wxDefaultCoord;
#endif #endif

10
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -49,12 +49,12 @@
#ifdef _WIN32 #ifdef _WIN32
#include <shellapi.h> #include <shellapi.h>
#ifndef SM_YVIRTUALSCREEN
#define SM_YVIRTUALSCREEN 77
#endif
#ifndef SM_XVIRTUALSCREEN #ifndef SM_XVIRTUALSCREEN
#define SM_XVIRTUALSCREEN 76 #define SM_XVIRTUALSCREEN 76
#endif #endif
#ifndef SM_YVIRTUALSCREEN
#define SM_YVIRTUALSCREEN 77
#endif
#ifndef SM_CXVIRTUALSCREEN #ifndef SM_CXVIRTUALSCREEN
#define SM_CXVIRTUALSCREEN 78 #define SM_CXVIRTUALSCREEN 78
#endif #endif
@ -308,10 +308,10 @@ bool DolphinApp::OnInit()
// do not allow windows to be created off the desktop. // do not allow windows to be created off the desktop.
#ifdef _WIN32 #ifdef _WIN32
// Out of desktop check // Out of desktop check
int height = GetSystemMetrics(SM_CYVIRTUALSCREEN);
int width = GetSystemMetrics(SM_CXVIRTUALSCREEN);
int leftPos = GetSystemMetrics(SM_XVIRTUALSCREEN); int leftPos = GetSystemMetrics(SM_XVIRTUALSCREEN);
int topPos = GetSystemMetrics(SM_YVIRTUALSCREEN); int topPos = GetSystemMetrics(SM_YVIRTUALSCREEN);
int width = GetSystemMetrics(SM_CXVIRTUALSCREEN);
int height = GetSystemMetrics(SM_CYVIRTUALSCREEN);
if ((leftPos + width) < (x + w) || leftPos > x || (topPos + height) < (y + h) || topPos > y) if ((leftPos + width) < (x + w) || leftPos > x || (topPos + height) < (y + h) || topPos > y)
x = y = wxDefaultCoord; x = y = wxDefaultCoord;
#elif defined __APPLE__ #elif defined __APPLE__