From 38d439c713d6aa8830f75245f7dbb1622de6d371 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Wed, 8 Feb 2006 22:20:15 +0000 Subject: [PATCH] fix ugly headers when using large fonts --- .../src/arch/Dialog/DialogDriver_Win32.cpp | 23 ++++++++++++++++-- stepmania/src/archutils/Win32/Crash.cpp | 20 +++++++++++++++ .../src/archutils/Win32/WindowsResources.h | 4 +-- .../src/archutils/Win32/WindowsResources.rc | 17 ++++++------- stepmania/src/archutils/Win32/header.bmp | Bin 31576 -> 0 bytes 5 files changed, 50 insertions(+), 14 deletions(-) delete mode 100644 stepmania/src/archutils/Win32/header.bmp diff --git a/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp b/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp index 5a7b561837..af318841b1 100644 --- a/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp +++ b/stepmania/src/arch/Dialog/DialogDriver_Win32.cpp @@ -156,14 +156,33 @@ static BOOL CALLBACK ErrorWndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lP Win32RestartProgram(); /* not reached */ ASSERT( 0 ); - EndDialog( hWnd, 0 ); break; - case IDOK: EndDialog( hWnd, 0 ); break; } + break; + case WM_CTLCOLORSTATIC: + { + HDC hdc = (HDC)wParam; + HWND hwndStatic = (HWND)lParam; + HBRUSH hbr = NULL; + + // TODO: Change any attributes of the DC here + switch( GetDlgCtrlID(hwndStatic) ) + { + case IDC_STATIC_HEADER_TEXT: + case IDC_STATIC_ICON: + hbr = (HBRUSH)::GetStockObject(WHITE_BRUSH); + SetBkMode( hdc, OPAQUE ); + SetBkColor( hdc, RGB(255,255,255) ); + break; + } + + // TODO: Return a different brush if the default is not desired + return (BOOL)hbr; + } } return FALSE; } diff --git a/stepmania/src/archutils/Win32/Crash.cpp b/stepmania/src/archutils/Win32/Crash.cpp index f7861522ba..fb48e912f4 100644 --- a/stepmania/src/archutils/Win32/Crash.cpp +++ b/stepmania/src/archutils/Win32/Crash.cpp @@ -943,6 +943,26 @@ BOOL APIENTRY CrashDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) break; } break; + case WM_CTLCOLORSTATIC: + { + HDC hdc = (HDC)wParam; + HWND hwndStatic = (HWND)lParam; + HBRUSH hbr = NULL; + + // TODO: Change any attributes of the DC here + switch( GetDlgCtrlID(hwndStatic) ) + { + case IDC_STATIC_HEADER_TEXT: + case IDC_STATIC_ICON: + hbr = (HBRUSH)::GetStockObject(WHITE_BRUSH); + SetBkMode( hdc, OPAQUE ); + SetBkColor( hdc, RGB(255,255,255) ); + break; + } + + // TODO: Return a different brush if the default is not desired + return (BOOL)hbr; + } } return FALSE; diff --git a/stepmania/src/archutils/Win32/WindowsResources.h b/stepmania/src/archutils/Win32/WindowsResources.h index 1fb5cf28c0..de240f4c8b 100644 --- a/stepmania/src/archutils/Win32/WindowsResources.h +++ b/stepmania/src/archutils/Win32/WindowsResources.h @@ -10,7 +10,6 @@ #define IDD_DISASM_CRASH 120 #define BITMAP_CRASH 121 #define BITMAP_ERROR 129 -#define IDB_HEADER 131 #define IDC_SHOCKWAVEFLASH1 1000 #define IDC_BUTTON_RESTART 1001 #define IDM_TOGGLEFULLSCREEN 1002 @@ -35,6 +34,7 @@ #define IDC_CHECK2 1019 #define IDC_SPLASH 1020 #define IDC_STATIC_HEADER_TEXT 1021 +#define IDC_STATIC_ICON 1022 #define IDC_ASMBOX 1133 #define IDC_REGDUMP 1283 #define IDC_STATIC_BOMBREASON 1284 @@ -48,7 +48,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 132 #define _APS_NEXT_COMMAND_VALUE 40009 -#define _APS_NEXT_CONTROL_VALUE 1022 +#define _APS_NEXT_CONTROL_VALUE 1023 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/stepmania/src/archutils/Win32/WindowsResources.rc b/stepmania/src/archutils/Win32/WindowsResources.rc index 0c25776dd0..9a0fef0ac4 100644 --- a/stepmania/src/archutils/Win32/WindowsResources.rc +++ b/stepmania/src/archutils/Win32/WindowsResources.rc @@ -31,16 +31,18 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION CAPTION "Fatal Error" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN + CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,0,332,35 DEFPUSHBUTTON "Close",IDOK,265,215,60,15 EDITTEXT IDC_EDIT_ERROR,5,59,320,151,ES_MULTILINE | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP PUSHBUTTON "View Log",IDC_BUTTON_VIEW_LOG,8,215,74,15 PUSHBUTTON "Report Error",IDC_BUTTON_REPORT,90,215,76,15 PUSHBUTTON "Restart Game",IDC_BUTTON_RESTART,175,215,80,15 - CONTROL 131,IDC_STATIC,"Static",SS_BITMAP,0,0,332,38 LTEXT "Specific details about the error are shown in the box below:", IDC_STATIC,7,45,319,11 LTEXT "Fatal Error",IDC_STATIC_HEADER_TEXT,5,5,249,23 + ICON IDI_ICON,IDC_STATIC_ICON,296,6,21,20 + CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,0,34,332,1 END IDD_LOADING_DIALOG DIALOG 0, 0, 312, 82 @@ -61,7 +63,6 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION "Program Crash" FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - CONTROL 131,IDC_STATIC,"Static",SS_BITMAP,0,0,332,38 PUSHBUTTON "&View Crash Info",IDC_CRASH_SAVE,29,169,94,15 PUSHBUTTON "View &Log",IDC_VIEW_LOG,128,169,63,15 PUSHBUTTON "Report the &Error",IDC_BUTTON_REPORT,196,169,89,15 @@ -72,9 +73,12 @@ BEGIN LTEXT "A crash has occurred. Diagnostic information has been saved to a file called ""crashinfo.txt"" in the game program directory.", IDC_STATIC,8,41,312,19 LTEXT "Estimated call stack",IDC_STATIC,6,85,155,10 - LTEXT "Program Crash",IDC_STATIC_HEADER_TEXT,6,5,276,22 LTEXT "Crash reason:",IDC_STATIC,7,64,219,8 CTEXT "crash reason here",IDC_STATIC_BOMBREASON,6,72,322,11 + CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,0,332,35 + LTEXT "Program Crash",IDC_STATIC_HEADER_TEXT,5,5,249,23 + ICON IDI_ICON,IDC_STATIC_ICON,296,6,21,20 + CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,0,34,332,1 END IDD_OK DIALOGEX 0, 0, 336, 98 @@ -200,13 +204,6 @@ BEGIN END END - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_HEADER BITMAP "header.bmp" #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/stepmania/src/archutils/Win32/header.bmp b/stepmania/src/archutils/Win32/header.bmp deleted file mode 100644 index 9a2c6a71f0a5ee1a9d3cf00acd8e7ab4dd6c3cb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31576 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 U1?|qz%zwcuuXj}e{