actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

merge old CreateGraphicsWindow

Browse Source
This commit is contained in:
Glenn Maynard
2006-01-15 01:10:45 +00:00
parent 61654be8de
commit 692cee7ddc
1 changed files with 25 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/archutils/Win32/GraphicsWindow.cpp
+25 -30
View File
@@ -224,34 +224,6 @@ static int GetWindowStyle( bool bWindowed )
return WS_POPUP;
}
static void CreateGraphicsWindow( const VideoModeParams &p )
{
int iWindowStyle = GetWindowStyle( p.windowed );
AppInstance inst;
HWND hWnd = CreateWindow( g_sClassName, "app", iWindowStyle,
0, 0, 0, 0, NULL, NULL, inst, NULL );
if( hWnd == NULL )
RageException::Throw( "%s", werr_ssprintf( GetLastError(), "CreateWindow" ).c_str() );
/* If an old window exists, transfer focus to the new window before deleting
* it, or some other window may temporarily get focus, which can cause it
* to be resized. */
if( g_hWndMain != NULL )
{
/* While we change to the new window, don't do ChangeDisplaySettings in WM_ACTIVATE. */
g_bRecreatingVideoMode = true;
SetForegroundWindow( hWnd );
g_bRecreatingVideoMode = false;
GraphicsWindow::DestroyGraphicsWindow();
}
g_hWndMain = hWnd;
CrashHandler::SetForegroundWindow( g_hWndMain );
g_HDC = GetDC( g_hWndMain );
}
/* Set the final window size, set the window text and icon, and then unhide the
* window. */
void GraphicsWindow::ConfigureGraphicsWindow( const VideoModeParams &p, bool bForceRecreateWindow )
@@ -259,9 +231,32 @@ void GraphicsWindow::ConfigureGraphicsWindow( const VideoModeParams &p, bool bFo
g_CurrentParams = p;
if( g_hWndMain == NULL || bForceRecreateWindow )
CreateGraphicsWindow( p );
{
int iWindowStyle = GetWindowStyle( p.windowed );
ASSERT( g_hWndMain );
AppInstance inst;
HWND hWnd = CreateWindow( g_sClassName, "app", iWindowStyle,
0, 0, 0, 0, NULL, NULL, inst, NULL );
if( hWnd == NULL )
RageException::Throw( "%s", werr_ssprintf( GetLastError(), "CreateWindow" ).c_str() );
/* If an old window exists, transfer focus to the new window before deleting
* it, or some other window may temporarily get focus, which can cause it
* to be resized. */
if( g_hWndMain != NULL )
{
/* While we change to the new window, don't do ChangeDisplaySettings in WM_ACTIVATE. */
g_bRecreatingVideoMode = true;
SetForegroundWindow( hWnd );
g_bRecreatingVideoMode = false;
GraphicsWindow::DestroyGraphicsWindow();
}
g_hWndMain = hWnd;
CrashHandler::SetForegroundWindow( g_hWndMain );
g_HDC = GetDC( g_hWndMain );
}
/* Update the window title. */
do