Fixed combobox color and font display issue.

David-Maisonave · David-Maisonave · commit 0fb1c0aabe7b · 2021-09-14T21:58:11.000-04:00
diff --git a/RegexAssistant/RegexAssistant.rc b/RegexAssistant/RegexAssistant.rc
diff --git a/RegexAssistant/RegexAssistantDlg.cpp b/RegexAssistant/RegexAssistantDlg.cpp
@@ -747,7 +747,7 @@ void CRegexAssistantDlg::OnBnClickedReplaceButton()
 	{
 		CString Msg;
 		Msg.Format(_T("Can not use character '%c' for \"%s\" compatibility.  Use character '%c' instead.\nTo replace the characters to correct prefix, answer yes.\nTo continue without correcting text, answer no."), 
-					IsNotCompatibleWithBackSlashReplacementToken() ? L'\\' : L'$', m_RegexCompatibilityProperties[m_Regex_Compalibility].Name, IsNotCompatibleWithBackSlashReplacementToken() ? L'$' : L'\\' );
+					(IsNotCompatibleWithBackSlashReplacementToken() ? '\\' : '$'), (m_RegexCompatibilityProperties[m_Regex_Compalibility].Name, IsNotCompatibleWithBackSlashReplacementToken() ? '$' : '\\') );
 		int Answer = MessageBox( Msg, _T( "Wrong argument number prefix charactor" ), MB_YESNOCANCEL );
 		if ( Answer == IDCANCEL )
 			return;
diff --git a/RegexAssistant/mfcx.ComboBox.cpp b/RegexAssistant/mfcx.ComboBox.cpp
@@ -114,9 +114,6 @@ namespace mfcx
 	void ComboBox::Initiate()
 	{
 		m_ListBox->SetParent( this );
-		NONCLIENTMETRICS ncm = {sizeof( NONCLIENTMETRICS )};
-		SystemParametersInfo( SPI_GETNONCLIENTMETRICS, sizeof( NONCLIENTMETRICS ), &ncm, 0 );
-		m_font.CreateFontIndirect( &ncm.lfStatusFont );
 	}
 
 	ComboBox::~ComboBox()
@@ -174,7 +171,7 @@ namespace mfcx
 	void ComboBox::DrawItem( LPDRAWITEMSTRUCT lpDrawItemStruct )
 	{
 		CDC* pDC = CDC::FromHandle( lpDrawItemStruct->hDC );
-		const RECT &rc = lpDrawItemStruct->rcItem;
+		RECT &rc = lpDrawItemStruct->rcItem;
 		BOOL IsItemSelected = (lpDrawItemStruct->itemState & ODS_SELECTED) ? TRUE : FALSE;
 		COLORREF oldTextColor = DEFAULT_COLORS;
 		COLORREF oldBkColor = DEFAULT_COLORS;
@@ -192,11 +189,11 @@ namespace mfcx
 
 			oldTextColor = pDC->SetTextColor( newTextColor );
 			oldBkColor = pDC->SetBkColor( newBkColor );
-
-			pOldFont = pDC->SelectObject( &m_font );
+			pOldFont = pDC->SelectObject( pDC->GetCurrentFont() );
 			GetLBText( lpDrawItemStruct->itemID, strText );
-			pDC->ExtTextOut( rc.left + 2,
-							 rc.top + 2,
+			CRect rectClient( rc );
+			pDC->ExtTextOut( rc.left,
+							 rc.top,
 							 ETO_OPAQUE, &rc,
 							 strText, NULL );
 			CSize TextSize = pDC->GetTextExtent( strText );
@@ -212,7 +209,6 @@ namespace mfcx
 
 			if ( m_hwndItemTip.m_hWnd != NULL && m_ToolTipItemRecievedStr )
 			{
-				CRect rectClient( rc );
 				int nComboButtonWidth = ::GetSystemMetrics( SM_CXHTHUMB ) + 2;
 				rectClient.right = rectClient.right - nComboButtonWidth;
 				ClientToScreen( &rectClient );
diff --git a/RegexAssistant/mfcx.ComboBox.h b/RegexAssistant/mfcx.ComboBox.h
@@ -119,7 +119,6 @@ namespace mfcx
 		const COLORREF m_EnabledSelectColor;
 		const COLORREF m_EnabledSelectBkColor;
 		std::vector<std::shared_ptr<ComboBoxItemDetails> > m_vComboBoxItemDetails;
-		CFont m_font;
 	protected:
 		CString m_strSavedText;	// saves text between OnSelendok and OnRealSelEndOK calls
 		std::unique_ptr<ComboBoxListBox> m_ListBox;

Original file line number	Diff line number	Diff line change
`@@ -747,7 +747,7 @@ void CRegexAssistantDlg::OnBnClickedReplaceButton()`
`747`	`747`	`{`
`748`	`748`	`CString Msg;`
`749`	`749`	`Msg.Format(_T("Can not use character '%c' for \"%s\" compatibility. Use character '%c' instead.\nTo replace the characters to correct prefix, answer yes.\nTo continue without correcting text, answer no."),`
`750`		`- IsNotCompatibleWithBackSlashReplacementToken() ? L'\\' : L'$', m_RegexCompatibilityProperties[m_Regex_Compalibility].Name, IsNotCompatibleWithBackSlashReplacementToken() ? L'$' : L'\\' );`
	`750`	`+ (IsNotCompatibleWithBackSlashReplacementToken() ? '\\' : '$'), (m_RegexCompatibilityProperties[m_Regex_Compalibility].Name, IsNotCompatibleWithBackSlashReplacementToken() ? '$' : '\\') );`
`751`	`751`	`int Answer = MessageBox( Msg, _T( "Wrong argument number prefix charactor" ), MB_YESNOCANCEL );`
`752`	`752`	`if ( Answer == IDCANCEL )`
`753`	`753`	`return;`