Skip to content
Permalink
Browse files

So much more readable now!

  • Loading branch information...
RachelBryk committed Mar 15, 2013
1 parent e877b50 commit d63d7fde9e9ca6b569ff56c1335d0587630a0bb3
Showing with 36 additions and 8 deletions.
  1. +18 −4 Source/Core/DolphinWX/Src/FrameTools.cpp
  2. +18 −4 Source/Core/DolphinWX/Src/Main.cpp
@@ -74,6 +74,20 @@ Core::GetWindowHandle().

#include <wx/datetime.h> // wxWidgets

#ifdef _WIN32
#ifndef SM_YVIRTUALSCREEN
#define SM_YVIRTUALSCREEN 77
#endif
#ifndef SM_XVIRTUALSCREEN
#define SM_XVIRTUALSCREEN 76
#endif
#ifndef SM_CXVIRTUALSCREEN
#define SM_CXVIRTUALSCREEN 78
#endif
#ifndef SM_CYVIRTUALSCREEN
#define SM_CYVIRTUALSCREEN 79
#endif
#endif

// Resources
extern "C" {
@@ -865,10 +879,10 @@ void CFrame::StartGame(const std::string& filename)
SConfig::GetInstance().m_LocalCoreStartupParameter.iRenderWindowHeight);
#ifdef _WIN32
// Out of desktop check
int height = GetSystemMetrics(79);
int width = GetSystemMetrics(78);
int leftPos = GetSystemMetrics(76);
int topPos = GetSystemMetrics(77);
int height = GetSystemMetrics(SM_CYVIRTUALSCREEN);
int width = GetSystemMetrics(SM_CXVIRTUALSCREEN);
int leftPos = GetSystemMetrics(SM_XVIRTUALSCREEN);
int topPos = GetSystemMetrics(SM_YVIRTUALSCREEN);
if ((leftPos + width) < (position.x + size.GetWidth()) || leftPos > position.x || (topPos + height) < (position.y + size.GetHeight()) || topPos > position.y)
position.x = position.y = wxDefaultCoord;
#endif
@@ -48,6 +48,20 @@

#ifdef _WIN32
#include <shellapi.h>

#ifndef SM_YVIRTUALSCREEN
#define SM_YVIRTUALSCREEN 77
#endif
#ifndef SM_XVIRTUALSCREEN
#define SM_XVIRTUALSCREEN 76
#endif
#ifndef SM_CXVIRTUALSCREEN
#define SM_CXVIRTUALSCREEN 78
#endif
#ifndef SM_CYVIRTUALSCREEN
#define SM_CYVIRTUALSCREEN 79
#endif

#endif

// Nvidia drivers >= v302 will check if the application exports a global
@@ -294,10 +308,10 @@ bool DolphinApp::OnInit()
// do not allow windows to be created off the desktop.
#ifdef _WIN32
// Out of desktop check
int height = GetSystemMetrics(79);
int width = GetSystemMetrics(78);
int leftPos = GetSystemMetrics(76);
int topPos = GetSystemMetrics(77);
int height = GetSystemMetrics(SM_CYVIRTUALSCREEN);
int width = GetSystemMetrics(SM_CXVIRTUALSCREEN);
int leftPos = GetSystemMetrics(SM_XVIRTUALSCREEN);
int topPos = GetSystemMetrics(SM_YVIRTUALSCREEN);
if ((leftPos + width) < (x + w) || leftPos > x || (topPos + height) < (y + h) || topPos > y)
x = y = wxDefaultCoord;
#elif defined __APPLE__

0 comments on commit d63d7fd

Please sign in to comment.
You can’t perform that action at this time.