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

Unhide and set window dimensions in one call to SetWindowPos. Fixes wrong window dimensions after unhiding on my notebook. Not sure why this wasn't working in 2 separate calls though.

Browse Source
This commit is contained in:
Chris Danford
2005-11-23 02:36:02 +00:00
parent 9df89a12d0
commit 20190e2e66
1 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/archutils/Win32/GraphicsWindow.cpp
+26 -27
View File
@@ -220,7 +220,7 @@ void GraphicsWindow::CreateGraphicsWindow( const VideoModeParams &p )
if( g_hWndMain == NULL ) if( g_hWndMain == NULL )
RageException::Throw( "%s", werr_ssprintf( GetLastError(), "CreateWindow" ).c_str() ); RageException::Throw( "%s", werr_ssprintf( GetLastError(), "CreateWindow" ).c_str() );
// SetForegroundWindow( g_hWndMain ); //SetForegroundWindow( g_hWndMain );
g_HDC = GetDC( g_hWndMain ); g_HDC = GetDC( g_hWndMain );
} }
@@ -251,6 +251,29 @@ void GraphicsWindow::ConfigureGraphicsWindow( const VideoModeParams &p )
{ {
ASSERT( g_hWndMain ); ASSERT( g_hWndMain );
/* Update the window title. */
do
{
if( m_bWideWindowClass )
{
if( SetWindowTextW( g_hWndMain, CStringToWstring(p.sWindowTitle).c_str() ) )
break;
}
SetWindowTextA( g_hWndMain, ConvertUTF8ToACP(p.sWindowTitle) );
} while(0);
/* Update the window icon. */
if( g_hIcon != NULL )
{
SetClassLong( g_hWndMain, GCL_HICON, (LONG) NULL );
DestroyIcon( g_hIcon );
g_hIcon = NULL;
}
g_hIcon = IconFromFile( p.sIconFile );
if( g_hIcon != NULL )
SetClassLong( g_hWndMain, GCL_HICON, (LONG) g_hIcon );
/* The window style may change as a result of switching to or from fullscreen; /* The window style may change as a result of switching to or from fullscreen;
* apply it. Don't change the WS_VISIBLE bit. */ * apply it. Don't change the WS_VISIBLE bit. */
int iWindowStyle = GetWindowStyle(p); int iWindowStyle = GetWindowStyle(p);
@@ -275,32 +298,8 @@ void GraphicsWindow::ConfigureGraphicsWindow( const VideoModeParams &p )
/* Move and resize the window. SWP_FRAMECHANGED causes the above SetWindowLong /* Move and resize the window. SWP_FRAMECHANGED causes the above SetWindowLong
* to take effect. */ * to take effect. */
SetWindowPos( g_hWndMain, HWND_NOTOPMOST, x, y, iWidth, iHeight, SWP_FRAMECHANGED ); if( !SetWindowPos( g_hWndMain, HWND_NOTOPMOST, x, y, iWidth, iHeight, SWP_FRAMECHANGED|SWP_SHOWWINDOW ) )
LOG->Warn( "%s", werr_ssprintf( GetLastError(), "SetWindowPos" ).c_str() );
/* Update the window title. */
do
{
if( m_bWideWindowClass )
{
if( SetWindowTextW( g_hWndMain, CStringToWstring(p.sWindowTitle).c_str() ) )
break;
}
SetWindowTextA( g_hWndMain, ConvertUTF8ToACP(p.sWindowTitle) );
} while(0);
/* Update the window icon. */
if( g_hIcon != NULL )
{
SetClassLong( g_hWndMain, GCL_HICON, (LONG) NULL );
DestroyIcon( g_hIcon );
g_hIcon = NULL;
}
g_hIcon = IconFromFile( p.sIconFile );
if( g_hIcon != NULL )
SetClassLong( g_hWndMain, GCL_HICON, (LONG) g_hIcon );
ShowWindow( g_hWndMain, SW_SHOW );
SetForegroundWindow( g_hWndMain ); SetForegroundWindow( g_hWndMain );