mirror of
https://github.com/hrydgard/ppsspp.git
synced 2024-12-02 10:36:22 +00:00
Move PPSSPP back onto the primary monitor if it's offscreen when opening.
This commit is contained in:
parent
1dccc952d9
commit
8ccb4cc863
@ -650,24 +650,49 @@ namespace MainWindow
|
||||
windowTitle = title;
|
||||
}
|
||||
|
||||
BOOL Show(HINSTANCE hInstance, int nCmdShow) {
|
||||
hInst = hInstance; // Store instance handle in our global variable.
|
||||
|
||||
RECT DetermineWindowRectangle() {
|
||||
RECT rc;
|
||||
|
||||
if (!g_Config.bFullScreen) {
|
||||
const int screenWidth = GetSystemMetrics(SM_CXSCREEN);
|
||||
const int screenHeight = GetSystemMetrics(SM_CYSCREEN);
|
||||
|
||||
bool visibleHorizontally = ((g_Config.iWindowX + g_Config.iWindowWidth) > 0) &&
|
||||
((g_Config.iWindowX + g_Config.iWindowWidth) < (screenWidth + g_Config.iWindowWidth));
|
||||
|
||||
bool visibleVertically = ((g_Config.iWindowY + g_Config.iWindowHeight) > 0) &&
|
||||
((g_Config.iWindowY + g_Config.iWindowHeight) < (screenHeight + g_Config.iWindowHeight));
|
||||
|
||||
if (!visibleHorizontally)
|
||||
g_Config.iWindowX = 0;
|
||||
|
||||
if (!visibleVertically)
|
||||
g_Config.iWindowY = 0;
|
||||
}
|
||||
|
||||
rc.left = g_Config.iWindowX;
|
||||
rc.top = g_Config.iWindowY;
|
||||
if (g_Config.iWindowWidth == 0) {
|
||||
RECT rcInner = rc, rcOuter;
|
||||
GetWindowRectAtResolution(2 * 480, 2 * 272, rcInner, rcOuter);
|
||||
rc.right = rc.left + (rcOuter.right - rcOuter.left);
|
||||
rc.bottom = rc.top + (rcOuter.bottom- rcOuter.top);
|
||||
rc.bottom = rc.top + (rcOuter.bottom - rcOuter.top);
|
||||
g_Config.iWindowWidth = rc.right - rc.left;
|
||||
g_Config.iWindowHeight = rc.bottom - rc.top;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
rc.right = g_Config.iWindowX + g_Config.iWindowWidth;
|
||||
rc.bottom = g_Config.iWindowY + g_Config.iWindowHeight;
|
||||
}
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
BOOL Show(HINSTANCE hInstance, int nCmdShow) {
|
||||
hInst = hInstance; // Store instance handle in our global variable.
|
||||
|
||||
RECT rc = DetermineWindowRectangle();
|
||||
|
||||
u32 style = WS_OVERLAPPEDWINDOW;
|
||||
|
||||
hwndMain = CreateWindowEx(0,szWindowClass, L"", style,
|
||||
|
Loading…
Reference in New Issue
Block a user