preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-12 14:00:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

More consistent handling of resolution changes. Should help #7995

Browse Source
This commit is contained in:
Henrik Rydgard committed 2015-09-23 12:25:38 +02:00
1 parent 7e70a743ca
commit ec63663ad5
6 files changed
+73 -61
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Windows/MainWindow.cpp
-53
View File
@@ -200,45 +200,6 @@ namespace MainWindow
rcOuter.top = g_Config.iWindowY;
}
static void ShowScreenResolution() {
I18NCategory *gr = GetI18NCategory("Graphics");
std::ostringstream messageStream;
messageStream << gr->T("Internal Resolution") << ": ";
messageStream << PSP_CoreParameter().renderWidth << "x" << PSP_CoreParameter().renderHeight << " ";
messageStream << gr->T("Window Size") << ": ";
messageStream << PSP_CoreParameter().pixelWidth << "x" << PSP_CoreParameter().pixelHeight;
osm.Show(messageStream.str(), 2.0f);
}
static void UpdateRenderResolution() {
RECT rc;
GetClientRect(hwndMain, &rc);
// Actually, auto mode should be more granular...
// Round up to a zoom factor for the render size.
int zoom = g_Config.iInternalResolution;
if (zoom == 0) { // auto mode
// Use the longest dimension
if (g_Config.IsPortrait()) {
zoom = (rc.bottom - rc.top + 479) / 480;
} else {
zoom = (rc.right - rc.left + 479) / 480;
}
}
if (zoom <= 1)
zoom = 1;
if (g_Config.IsPortrait()) {
PSP_CoreParameter().renderWidth = 272 * zoom;
PSP_CoreParameter().renderHeight = 480 * zoom;
} else {
PSP_CoreParameter().renderWidth = 480 * zoom;
PSP_CoreParameter().renderHeight = 272 * zoom;
}
}
static bool IsWindowSmall() {
// Can't take this from config as it will not be set if windows is maximized.
RECT rc;
@@ -259,7 +220,6 @@ namespace MainWindow
GetWindowRectAtResolution(480 * (int)zoom, 272 * (int)zoom, rc, rcOuter);
}
MoveWindow(hwndMain, rcOuter.left, rcOuter.top, rcOuter.right - rcOuter.left, rcOuter.bottom - rcOuter.top, TRUE);
ShowScreenResolution();
}
void SetInternalResolution(int res) {
@@ -276,9 +236,6 @@ namespace MainWindow
if (gpu)
gpu->Resized();
UpdateRenderResolution();
ShowScreenResolution();
}
void CorrectCursor() {
@@ -320,8 +277,6 @@ namespace MainWindow
PSP_CoreParameter().pixelHeight = height;
}
UpdateRenderResolution();
if (UpdateScreenScale(width, height, IsWindowSmall())) {
NativeMessageReceived("gpu resized", "");
}
@@ -395,10 +350,6 @@ namespace MainWindow
CorrectCursor();
bool showOSM = (g_Config.iInternalResolution == RESOLUTION_AUTO);
if (showOSM) {
ShowScreenResolution();
}
ShowOwnedPopups(hwndMain, goingFullscreen ? FALSE : TRUE);
W32Util::MakeTopMost(hwndMain, g_Config.bTopMost);
@@ -902,10 +853,6 @@ namespace MainWindow
TranslateMenus(hwndMain, menu);
break;
case WM_USER_UPDATE_SCREEN:
ShowScreenResolution();
break;
case WM_USER_WINDOW_TITLE_CHANGED:
UpdateWindowTitle();
break;