libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-27 10:20:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Win32: Fullscreen toggle and resizing the window works better.

Browse Source
This commit is contained in:
Henrik Rydgard 2013-01-26 23:46:02 +01:00
parent 021bc613b8
commit 2a2f8e6225
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Windows/WndMainWindow.cpp
View File

@ -107,8 +107,9 @@ namespace MainWindow
}
void GetWindowRectAtZoom(int zoom, RECT &rcInner, RECT &rcOuter) {
rcInner.left=20;
rcInner.top=100;
// GetWindowRect(hwndMain, &rcInner);
rcInner.left = 20;
rcInner.top = 120;
rcInner.right=480*zoom + rcInner.left;//+client edge
rcInner.bottom=272*zoom + rcInner.top; //+client edge
@ -117,16 +118,22 @@ namespace MainWindow
AdjustWindowRect(&rcOuter, WS_OVERLAPPEDWINDOW, TRUE);
}
void ResizeDisplay() {
RECT rc;
GetClientRect(hwndMain, &rc);
MoveWindow(hwndDisplay, 0, 0, PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight, TRUE);
PSP_CoreParameter().pixelWidth = rc.right - rc.left;
PSP_CoreParameter().pixelHeight = rc.bottom - rc.top;
GL_Resized();
}
void SetZoom(float zoom) {
if (zoom < 5)
g_Config.iWindowZoom = (int) zoom;
RECT rc, rcOuter;
GetWindowRectAtZoom((int) zoom, rc, rcOuter);
MoveWindow(hwndMain, rcOuter.left, rcOuter.top, rcOuter.right - rcOuter.left, rcOuter.bottom - rcOuter.top, TRUE);
MoveWindow(hwndDisplay, 0, 0, rc.right - rc.left, rc.bottom - rc.top, TRUE);
PSP_CoreParameter().pixelWidth = (int) (480 * zoom);
PSP_CoreParameter().pixelHeight = (int) (272 * zoom);
GL_Resized();
ResizeDisplay();
}
BOOL Show(HINSTANCE hInstance, int nCmdShow)
@ -472,12 +479,8 @@ namespace MainWindow
case ID_OPTIONS_FULLSCREEN:
if(g_bFullScreen) {
_ViewNormal(hWnd);
SetZoom(1); //restore window to original size
}
else {
int cx = ::GetSystemMetrics(SM_CXSCREEN);
float screenfactor = cx / 480.0f;
SetZoom(screenfactor);
_ViewFullScreen(hWnd);
}
UpdateMenus();
@ -613,6 +616,9 @@ namespace MainWindow
PostQuitMessage(0);
break;
case WM_SIZE:
{
ResizeDisplay();
}
break;
case WM_NCHITTEST:
if (skinMode)
@ -799,6 +805,7 @@ namespace MainWindow
// reset full screen indicator
g_bFullScreen = FALSE;
ResizeDisplay();
}
void _ViewFullScreen(HWND hWnd)
@ -824,6 +831,7 @@ namespace MainWindow
// set full screen indicator
g_bFullScreen = TRUE;
ResizeDisplay();
}
void SetPlaying(const char *text)

2
android/jni/MenuScreens.cpp
View File

@ -158,6 +158,8 @@ void MenuScreen::render() {
double xoff = 150 - frames_ * frames_ * 0.4f;
if (xoff < -20)
xoff = -20;
if (frames_ > 200) // seems the above goes nuts after a while...
xoff = -20;
int w = LARGE_BUTTON_WIDTH + 40;