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

Merge pull request #3750 from thedax/properFullScreenLaunchArg

Browse Source 
Win32: Fullscreen launch arg and adjustments.
This commit is contained in:
Henrik Rydgård 2013-09-12 14:41:46 -07:00
commit fad97201f9
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/Config.cpp
View File

@ -157,7 +157,6 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename)
graphics->Get("VertexCache", &bVertexCache, true);
#ifdef _WIN32
graphics->Get("FullScreen", &bFullScreen, false);
graphics->Get("FullScreenOnLaunch", &bFullScreenOnLaunch, false);
#endif
#ifdef BLACKBERRY
graphics->Get("PartialStretch", &bPartialStretch, pixel_xres == pixel_yres);
@ -316,7 +315,6 @@ void Config::Save() {
graphics->Set("VertexCache", bVertexCache);
#ifdef _WIN32
graphics->Set("FullScreen", bFullScreen);
graphics->Set("FullScreenOnLaunch", bFullScreenOnLaunch);
#endif
#ifdef BLACKBERRY
graphics->Set("PartialStretch", bPartialStretch);

3
Core/Config.h
View File

@ -78,9 +78,6 @@ public:
bool bVertexCache;
bool bFullScreen;
#ifdef _WIN32
bool bFullScreenOnLaunch;
#endif
int iInternalResolution; // 0 = Auto (native), 1 = 1x (480x272), 2 = 2x, 3 = 3x, 4 = 4x and so on.
int iAnisotropyLevel; // 0 - 5, powers of 2: 0 = 1x = no aniso
bool bTrueColor;

8
Windows/WndMainWindow.cpp
View File

@ -250,7 +250,7 @@ namespace MainWindow
void _ViewNormal(HWND hWnd) {
// Put caption and border styles back.
DWORD dwOldStyle = ::GetWindowLong(hWnd, GWL_STYLE);
DWORD dwNewStyle = dwOldStyle | WS_CAPTION | WS_THICKFRAME;
DWORD dwNewStyle = dwOldStyle | WS_CAPTION | WS_THICKFRAME | WS_SYSMENU;
::SetWindowLong(hWnd, GWL_STYLE, dwNewStyle);
// Put back the menu bar.
@ -277,7 +277,7 @@ namespace MainWindow
// Remove caption and border styles.
DWORD dwOldStyle = ::GetWindowLong(hWnd, GWL_STYLE);
DWORD dwNewStyle = dwOldStyle & ~(WS_CAPTION | WS_THICKFRAME);
DWORD dwNewStyle = dwOldStyle & ~(WS_CAPTION | WS_THICKFRAME | WS_SYSMENU);
::SetWindowLong(hWnd, GWL_STYLE, dwNewStyle);
// Remove the menu bar.
@ -706,9 +706,7 @@ namespace MainWindow
hideCursor = true;
SetTimer(hwndMain, TIMER_CURSORUPDATE, CURSORUPDATE_INTERVAL_MS, 0);
// Update();
if(g_Config.bFullScreenOnLaunch)
if(g_Config.bFullScreen)
_ViewFullScreen(hwndMain);
ShowWindow(hwndMain, nCmdShow);

19
Windows/main.cpp
View File

@ -83,13 +83,16 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin
}
SetCurrentDirectory(modulePath);
// GetCurrentDirectory(MAX_PATH, modulePath); // for checking in the debugger
#ifndef _DEBUG
bool hideLog = true;
#ifdef _DEBUG
hideLog = false;
#else
bool hideLog = false;
#endif
// Load config up here, because those changes below would be overwritten
// if it's not loaded here first.
g_Config.Load();
// The rest is handled in NativeInit().
for (int i = 1; i < __argc; ++i)
{
@ -108,6 +111,12 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin
g_Config.bSaveSettings = false;
break;
}
if (!strncmp(__argv[i], "--fullscreen", strlen("--fullscreen")))
g_Config.bFullScreen = true;
if (!strncmp(__argv[i], "--windowed", strlen("--windowed")))
g_Config.bFullScreen = false;
}
}
@ -128,8 +137,6 @@ int WINAPI WinMain(HINSTANCE _hInstance, HINSTANCE hPrevInstance, LPSTR szCmdLin
langRegion = "en_US";
}
g_Config.Load();
LogManager::Init();
LogManager::GetInstance()->GetConsoleListener()->Open(hideLog, 150, 120, "PPSSPP Debug Console");