浏览代码

show & when typed into search box

sabrogden 7 年之前
父节点
当前提交
f19a82a3cf
共有 2 个文件被更改,包括 4 次插入2 次删除
  1. 2 2
      SymbolEdit.cpp
  2. 2 0
      ToolTipEx.cpp

+ 2 - 2
SymbolEdit.cpp

@@ -474,7 +474,7 @@ void CSymbolEdit::OnPaint()
 		COLORREF oldColor = dc.GetTextColor();
 		COLORREF oldColor = dc.GetTextColor();
 		dc.SetTextColor(g_Opt.m_Theme.SearchTextBoxFocusText());
 		dc.SetTextColor(g_Opt.m_Theme.SearchTextBoxFocusText());
 			
 			
-		dc.DrawText(text, textRect, DT_SINGLELINE | DT_INTERNAL | DT_EDITCONTROL);
+		dc.DrawText(text, textRect, DT_SINGLELINE | DT_INTERNAL | DT_EDITCONTROL | DT_NOPREFIX);
 
 
 		dc.SelectObject(oldFont);
 		dc.SelectObject(oldFont);
 		dc.SetTextColor(oldColor);
 		dc.SetTextColor(oldColor);
@@ -495,7 +495,7 @@ void CSymbolEdit::OnPaint()
 		COLORREF color = dc.GetTextColor();
 		COLORREF color = dc.GetTextColor();
 		dc.SetTextColor(m_colorPromptText);
 		dc.SetTextColor(m_colorPromptText);
 
 
-		dc.DrawText(m_strPromptText, textRect, DT_LEFT | DT_SINGLELINE | DT_EDITCONTROL | DT_VCENTER);
+		dc.DrawText(m_strPromptText, textRect, DT_LEFT | DT_SINGLELINE | DT_EDITCONTROL | DT_VCENTER | DT_NOPREFIX);
 		dc.SetTextColor(color);
 		dc.SetTextColor(color);
 		dc.SelectObject(oldFont);
 		dc.SelectObject(oldFont);
 	}
 	}

+ 2 - 0
ToolTipEx.cpp

@@ -1154,6 +1154,8 @@ void CToolTipEx::OnEnMsgfilterRichedit21(NMHDR *pNMHDR, LRESULT *pResult)
 	{
 	{
 		switch (pMsgFilter->msg)
 		switch (pMsgFilter->msg)
 		{
 		{
+			//handle click on the rich text control when it doesn't have focus
+			//set focus so the first click is handled by the rich text control
 			case WM_MOUSEACTIVATE:
 			case WM_MOUSEACTIVATE:
 				m_RichEdit.SetFocus();
 				m_RichEdit.SetFocus();
 				break;
 				break;