From 4d6d0f9815bbfb39ecee08fb5c832f3ee4aa481b Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Wed, 8 Feb 2006 20:57:09 +0000 Subject: [PATCH] fix ugly headers when using large fonts --- .../src/smpackage/ChangeGameSettings.cpp | 15 ------------ stepmania/src/smpackage/ChangeGameSettings.h | 1 - stepmania/src/smpackage/MainMenuDlg.cpp | 12 ++++++--- .../src/smpackage/SMPackageInstallDlg.cpp | 10 +++++--- stepmania/src/smpackage/header.bmp | Bin 31576 -> 0 bytes stepmania/src/smpackage/resource.h | 5 ++-- stepmania/src/smpackage/smpackage.rc | 23 +++++++++--------- 7 files changed, 29 insertions(+), 37 deletions(-) delete mode 100644 stepmania/src/smpackage/header.bmp diff --git a/stepmania/src/smpackage/ChangeGameSettings.cpp b/stepmania/src/smpackage/ChangeGameSettings.cpp index 7632dd52a5..3ab2dc695e 100644 --- a/stepmania/src/smpackage/ChangeGameSettings.cpp +++ b/stepmania/src/smpackage/ChangeGameSettings.cpp @@ -163,21 +163,6 @@ void ChangeGameSettings::OnOK() CDialog::OnOK(); } -HBRUSH ChangeGameSettings::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor) -{ - HBRUSH hbr = CDialog::OnCtlColor(pDC, pWnd, nCtlColor); - - // TODO: Change any attributes of the DC here - if( pWnd->GetDlgCtrlID() == IDC_STATIC_HEADER_TEXT ) - { - hbr = (HBRUSH)::GetStockObject(HOLLOW_BRUSH); - pDC->SetBkMode(TRANSPARENT); - } - - // TODO: Return a different brush if the default is not desired - return hbr; -} - /* * (c) 2002-2005 Chris Danford * All rights reserved. diff --git a/stepmania/src/smpackage/ChangeGameSettings.h b/stepmania/src/smpackage/ChangeGameSettings.h index f4aabd04e9..aac51e1f71 100644 --- a/stepmania/src/smpackage/ChangeGameSettings.h +++ b/stepmania/src/smpackage/ChangeGameSettings.h @@ -40,7 +40,6 @@ protected: //}}AFX_MSG DECLARE_MESSAGE_MAP() public: - afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor); }; //{{AFX_INSERT_LOCATION}} diff --git a/stepmania/src/smpackage/MainMenuDlg.cpp b/stepmania/src/smpackage/MainMenuDlg.cpp index bddf698fbb..756c3c01db 100644 --- a/stepmania/src/smpackage/MainMenuDlg.cpp +++ b/stepmania/src/smpackage/MainMenuDlg.cpp @@ -174,6 +174,8 @@ BOOL MainMenuDlg::OnInitDialog() DialogUtil::LocalizeDialogAndContents( *this ); DialogUtil::SetHeaderFont( *this, IDC_STATIC_HEADER_TEXT ); + //DialogUtil::SetDlgItemHeader( *this, IDC_STATIC_HEADER_TEXT, "header" ); + TCHAR szCurDir[MAX_PATH]; GetCurrentDirectory( ARRAYSIZE(szCurDir), szCurDir ); GetDlgItem( IDC_EDIT_INSTALLATION )->SetWindowText( szCurDir ); @@ -263,10 +265,14 @@ HBRUSH MainMenuDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor) HBRUSH hbr = CDialog::OnCtlColor(pDC, pWnd, nCtlColor); // TODO: Change any attributes of the DC here - if( pWnd->GetDlgCtrlID() == IDC_STATIC_HEADER_TEXT ) + switch( pWnd->GetDlgCtrlID() ) { - hbr = (HBRUSH)::GetStockObject(HOLLOW_BRUSH); - pDC->SetBkMode(TRANSPARENT); + case IDC_STATIC_HEADER_TEXT: + case IDC_STATIC_ICON: + hbr = (HBRUSH)::GetStockObject(WHITE_BRUSH); + pDC->SetBkMode(OPAQUE); + pDC->SetBkColor( RGB(255,255,255) ); + break; } // TODO: Return a different brush if the default is not desired diff --git a/stepmania/src/smpackage/SMPackageInstallDlg.cpp b/stepmania/src/smpackage/SMPackageInstallDlg.cpp index b0eb58119b..acd2ae02c6 100644 --- a/stepmania/src/smpackage/SMPackageInstallDlg.cpp +++ b/stepmania/src/smpackage/SMPackageInstallDlg.cpp @@ -415,10 +415,14 @@ HBRUSH CSMPackageInstallDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor) HBRUSH hbr = CDialog::OnCtlColor(pDC, pWnd, nCtlColor); // TODO: Change any attributes of the DC here - if( pWnd->GetDlgCtrlID() == IDC_STATIC_HEADER_TEXT ) + switch( pWnd->GetDlgCtrlID() ) { - hbr = (HBRUSH)::GetStockObject(HOLLOW_BRUSH); - pDC->SetBkMode(TRANSPARENT); + case IDC_STATIC_HEADER_TEXT: + case IDC_STATIC_ICON: + hbr = (HBRUSH)::GetStockObject(WHITE_BRUSH); + pDC->SetBkMode(OPAQUE); + pDC->SetBkColor( RGB(255,255,255) ); + break; } // TODO: Return a different brush if the default is not desired diff --git a/stepmania/src/smpackage/header.bmp b/stepmania/src/smpackage/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{",IDOK,200,215,55,15 PUSHBUTTON "Cancel",IDCANCEL,275,215,50,15 PUSHBUTTON "< Back",IDC_BUTTON_BACK,145,215,55,15,WS_DISABLED - CONTROL 1045,IDC_STATIC,"Static",SS_BITMAP,0,0,332,38 EDITTEXT IDC_EDIT_MESSAGE2,5,90,320,87,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | NOT WS_TABSTOP @@ -93,13 +92,17 @@ BEGIN PUSHBUTTON "Edit Installations",IDC_BUTTON_EDIT,233,194,85,14 CONTROL "",IDC_PROGRESS1,"msctls_progress32",NOT WS_VISIBLE | WS_BORDER,7,72,318,14 - LTEXT "Install a package",IDC_STATIC_HEADER_TEXT,5,5,280,24 LTEXT "You have chosen to install the package:", IDC_STATIC_MESSAGE1,7,41,318,10 LTEXT "This package contains the following files:", IDC_STATIC_MESSAGE2,7,76,318,10 LTEXT "The package will be installed in the following program folder:", IDC_STATIC,7,181,318,10 + CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,0,331,33 + LTEXT "Install a package",IDC_STATIC_HEADER_TEXT,6,4,273,20 + CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,0,33,331,1 + ICON IDR_MAINFRAME,IDC_STATIC_ICON,295,6,21,20,0, + WS_EX_TRANSPARENT END IDD_EXPORTER DIALOGEX 0, 0, 349, 222 @@ -165,8 +168,10 @@ STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "StepMania Tools Main Menu" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN + CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,0,331,33 + LTEXT "StepMania Tools Main Menu",IDC_STATIC_HEADER_TEXT,6,4, + 273,20 DEFPUSHBUTTON "Exit",IDOK,275,263,50,14 - CONTROL 1045,IDC_STATIC,"Static",SS_BITMAP,0,0,332,38 GROUPBOX "Installation",IDC_STATIC,7,41,318,28 PUSHBUTTON "Edit Installations",IDC_EDIT_INSTALLATIONS,233,49,83,15 GROUPBOX "Create and Share",IDC_STATIC,7,176,318,78 @@ -191,12 +196,13 @@ BEGIN PUSHBUTTON "Languages",IDC_LANGUAGES,14,232,91,15 LTEXT "Create a new or manage existing language translations.", IDC_STATIC,109,232,213,20 - LTEXT "StepMania Tools Main Menu",IDC_STATIC_HEADER_TEXT,5,5, - 280,24 LTEXT "Open the preferences file to make changes by hand.", IDC_STATIC,109,127,213,18 LTEXT "Clear all preferences if you've made changes and the game won't start.", IDC_STATIC,109,106,213,18 + CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,0,33,331,1 + ICON IDR_MAINFRAME,IDC_STATIC_ICON,295,6,21,20,0, + WS_EX_TRANSPARENT END IDD_ENTER_COMMENT DIALOGEX 0, 0, 312, 202 @@ -460,13 +466,6 @@ BEGIN END #endif // APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// Bitmap -// - -IDB_HEADER BITMAP "header.bmp" #endif // English (U.S.) resources /////////////////////////////////////////////////////////////////////////////