outline search box in accent color, use accent color to highlight search results

QListCtrl.cpp

@@ -443,9 +443,10 @@ void CQListCtrl::OnCustomdrawList(NMHDR* pNMHDR, LRESULT* pResult)
 		
 		if(DrawRtfText(nItem, rcText, pDC) == FALSE)
 		{
+			auto highlightColor = g_Opt.m_Theme.SearchTextHighlight();
 			//use unprintable characters so it doesn't find copied html to convert
 			if (m_searchText.GetLength() > 0 &&
-				FindNoCaseAndInsert(csText, m_searchText, _T("\x01\x04 color='#ff0000'\x02"), _T("\x01\x03\x04\x02"), m_linesPerRow) > 0)
+				FindNoCaseAndInsert(csText, m_searchText, StrF(_T("\x01\x04 color='#%02x%02x%02x'\x02"), GetRValue(highlightColor), GetGValue(highlightColor), GetBValue(highlightColor)), _T("\x01\x03\x04\x02"), m_linesPerRow) > 0)
 			{				
 				DrawHTML(pDC->m_hDC, csText, csText.GetLength(), rcText, DT_VCENTER | DT_EXPANDTABS | DT_NOPREFIX);
 			}

QPasteWnd.cpp

@@ -676,7 +676,7 @@ void CQPasteWnd::MoveControls()
 
 		m_lstHeader.MoveWindow(0, topOfListBox, cx + extraSize, cy - listBoxBottomOffset - topOfListBox + extraSize + 1);
 	}
-	m_search.MoveWindow(m_DittoWindow.m_dpi.Scale(34), cy - m_DittoWindow.m_dpi.Scale(searchRowStart-5), cx - m_DittoWindow.m_dpi.Scale(70), m_DittoWindow.m_dpi.Scale(23));
+	m_search.MoveWindow(m_DittoWindow.m_dpi.Scale(34), cy - m_DittoWindow.m_dpi.Scale(searchRowStart-5), cx - m_DittoWindow.m_dpi.Scale(70), m_DittoWindow.m_dpi.Scale(25));
 
 	m_systemMenu.MoveWindow(cx - m_DittoWindow.m_dpi.Scale(30), cy - m_DittoWindow.m_dpi.Scale(28), m_DittoWindow.m_dpi.Scale(24), m_DittoWindow.m_dpi.Scale(24));
 

SymbolEdit.cpp

@@ -1,786 +1,797 @@
-// AeroEdit.cpp : implementation file
-//
-
-#include "stdafx.h"
-#include "SymbolEdit.h"
-#include "cp_main.h"
-#include "QListCtrl.h"
-#include "Shared\TextConvert.h"
-
-// CSymbolEdit
-
-#define RANGE_START 3000
-#define CLEAR_LIST 3050
-#define LIST_MAX_COUNT 50
-
-IMPLEMENT_DYNAMIC(CSymbolEdit, CEdit)
-
-CSymbolEdit::CSymbolEdit() :
-	m_hSymbolIcon(NULL),
-	m_bInternalIcon(false),
-	m_colorPromptText(RGB(127, 127, 127))
-{
-	m_fontPrompt.CreateFont(
-		16,                        // nHeight
-		0,                         // nWidth
-		0,                         // nEscapement
-		0,                         // nOrientation
-		FW_NORMAL,                 // nWeight
-		TRUE,                      // bItalic
-		FALSE,                     // bUnderline
-		0,                         // cStrikeOut
-		DEFAULT_CHARSET,           // nCharSet
-		OUT_DEFAULT_PRECIS,        // nOutPrecision
-		CLIP_DEFAULT_PRECIS,       // nClipPrecision
-		DEFAULT_QUALITY,           // nQuality
-		DEFAULT_PITCH | FF_SWISS,  // nPitchAndFamily
-		_T("Calibri"));
-
-	m_mouseDownOnSearches = false;
-	m_mouseHoveringOverSearches = false;
-	m_mouseDownOnClose = false;
-	m_mouseHoveringOverClose = false;
-	m_windowDpi = NULL;
-
-	//m_searchButton.LoadStdImageDPI(Search_16, Search_20, Search_24, Search_32, _T("PNG"));
-	
-}
-
-CSymbolEdit::~CSymbolEdit()
-{
-	DestroyIcon();
-}
-
-
-BEGIN_MESSAGE_MAP(CSymbolEdit, CEdit)
-	ON_WM_PAINT()
-	ON_MESSAGE(WM_SETFONT, OnSetFont)
-	//ON_MESSAGE(WM_EXITMENULOOP, OnMenuExit)
-	ON_WM_CTLCOLOR_REFLECT()
-	ON_WM_SETFOCUS()
-	ON_WM_KILLFOCUS()
-	ON_WM_SETCURSOR()
-	ON_WM_LBUTTONUP()
-	ON_WM_LBUTTONDOWN()
-	ON_WM_MOUSEMOVE()
-	ON_COMMAND_RANGE(RANGE_START, (RANGE_START+ LIST_MAX_COUNT), OnSelectSearchString)
-	ON_WM_EXITSIZEMOVE()
-END_MESSAGE_MAP()
-
-BOOL CSymbolEdit::PreTranslateMessage(MSG* pMsg)
-{
-	// TODO: Add your specialized code here and/or call the base class
-	// Intercept Ctrl + Z (Undo), Ctrl + X (Cut), Ctrl + C (Copy), Ctrl + V (Paste) and Ctrl + A (Select All)
-	// before CEdit base class gets a hold of them.
-	if (pMsg->message == WM_KEYDOWN &&
-		CONTROL_PRESSED)
-	{
-		switch (pMsg->wParam)
-		{
-		case 'Z':
-			Undo();
-			return TRUE;
-		case 'X':
-			Cut();
-			return TRUE;
-		case 'C':
-			{
-				int startChar;
-				int endChar;
-				this->GetSel(startChar, endChar);
-				if (startChar == endChar)
-				{
-					CWnd *pWnd = GetParent();
-					if (pWnd)
-					{
-						pWnd->SendMessage(NM_COPY_CLIP, pMsg->wParam, pMsg->lParam);
-					}
-				}
-				else
-				{
-					Copy();
-				}
-			}
-			return TRUE;
-		case 'V':
-			Paste();
-			return TRUE;
-		case 'A':
-			SetSel(0, -1);
-			return TRUE;
-		}
-	}
-
-	switch (pMsg->message)
-	{
-	case WM_KEYDOWN:
-	{
-		if (pMsg->wParam == VK_RETURN)
-		{
-			CWnd *pWnd = GetParent();
-			if (pWnd)
-			{
-				if (g_Opt.m_bFindAsYouType)
-				{
-					pWnd->SendMessage(NM_SEARCH_ENTER_PRESSED, 0, 0);
-				}
-				else
-				{
-					//Send a message to the parent to refill the lb from the search
-					pWnd->PostMessage(CB_SEARCH, 0, 0);
-				}
-
-				AddToSearchHistory();
-			}
-
-			return TRUE;
-		}
-		else if (pMsg->wParam == VK_DOWN &&
-			((GetKeyState(VK_CONTROL) & 0x8000) || ((GetKeyState(VK_CONTROL) & 0x8000) && (GetKeyState(VK_SHIFT) & 0x8000))))
-		{
-			if (ShowSearchHistoryMenu())
-			{
-				return TRUE;
-			}
-		}
-		else if (pMsg->wParam == VK_DOWN ||
-			pMsg->wParam == VK_UP ||
-			pMsg->wParam == VK_PRIOR ||
-			pMsg->wParam == VK_NEXT)
-		{
-			CWnd *pWnd = GetParent();
-			if (pWnd)
-			{
-				pWnd->SendMessage(CB_UPDOWN, pMsg->wParam, pMsg->lParam);
-				return TRUE;
-			}
-		}
-		else if (pMsg->wParam == VK_DELETE)
-		{
-			int startChar;
-			int endChar;
-			this->GetSel(startChar, endChar);
-			CString cs;
-			this->GetWindowText(cs);
-			//if selection is at the end then forward this on to the parent to delete the selected clip
-			if(startChar == cs.GetLength() &&
-				endChar == cs.GetLength())
-			{ 
-				CWnd *pWnd = GetParent();
-				if (pWnd)
-				{
-					pWnd->SendMessage(NM_DELETE, pMsg->wParam, pMsg->lParam);
-					return TRUE;
-				}
-			}
-		}
-		break;
-	}
-	}
-
-	return CEdit::PreTranslateMessage(pMsg);
-}
-
-CString CSymbolEdit::SavePastSearches()
-{
-	TiXmlDocument doc;
-
-	TiXmlElement* outer = new TiXmlElement("PastSearches");
-	doc.LinkEndChild(outer);
-
-	int count = (int)m_searches.GetCount();
-	for (int i = 0; i < count; i++)
-	{		
-		TiXmlElement* searchElement = new TiXmlElement("Search");
-
-		CStringA t;
-		CTextConvert::ConvertToUTF8(m_searches[i], t);
-		searchElement->SetAttribute("text", t);
-
-		outer->LinkEndChild(searchElement);
-	}
-
-	TiXmlPrinter printer;
-	printer.SetLineBreak("");
-	doc.Accept(&printer);
-	CString cs = printer.CStr();
-
-	return cs;
-}
-
-void CSymbolEdit::LoadPastSearches(CString values)
-{
-	m_searches.RemoveAll();
-
-	TiXmlDocument doc;
-	CStringA xmlA;
-	CTextConvert::ConvertToUTF8(values, xmlA);
-	doc.Parse(xmlA);
-
-	TiXmlElement *ItemHeader = doc.FirstChildElement("PastSearches");
-
-	if (ItemHeader != NULL)
-	{
-		TiXmlElement *ItemElement = ItemHeader->FirstChildElement();
-
-		while (ItemElement)
-		{
-			CString item = ItemElement->Attribute("text");
-
-			m_searches.Add(item);
-
-			ItemElement = ItemElement->NextSiblingElement();
-		}
-	}
-}
-
-void CSymbolEdit::AddToSearchHistory()
-{
-	CString cs;
-	this->GetWindowText(cs);
-	if (cs != _T(""))
-	{
-		if (m_searches.GetCount() >= LIST_MAX_COUNT)
-		{
-			m_searches.RemoveAt(0);
-		}
-
-		bool existing = false;
-		int count = (int)m_searches.GetCount();
-		for (int i = 0; i < count; i++)
-		{
-			if (m_searches[i] == cs)
-			{
-				m_searches.RemoveAt(i);
-				m_searches.Add(cs);
-				existing = true;
-				break;
-			}
-		}
-
-		if (existing == false)
-		{
-			m_searches.Add(cs);
-		}
-	}
-}
-
-bool CSymbolEdit::ShowSearchHistoryMenu()
-{
-	if (m_searches.GetCount() == 0)
-	{
-		return false;
-	}
-
-	CMenu cmPopUp;
-	cmPopUp.CreatePopupMenu();
-
-	int count = min((int)m_searches.GetCount(), LIST_MAX_COUNT);
-	for (int i = count-1; i >= 0; i--)
-	{
-		CString text = m_searches[i];
-
-		if (i == count - 1 &&
-			m_lastSearchShortCut.Key > 0)
-		{
-			CString cmdShortcutText = CHotKey::GetHotKeyDisplayStatic(m_lastSearchShortCut.Key);
-			if (m_lastSearchShortCut.Key2 != 0)
-			{
-				CString cmdShortcutText2 = CHotKey::GetHotKeyDisplayStatic(m_lastSearchShortCut.Key2);
-
-				if (cmdShortcutText2.GetLength() > 0)
-				{
-					cmdShortcutText += _T(" - ");
-					cmdShortcutText += cmdShortcutText2;
-				}
-			}
-
-			text += "\t";
-			text += cmdShortcutText;
-		}
-
-		cmPopUp.AppendMenuW(MF_STRING, (RANGE_START + i), text);
-	}
-
-	cmPopUp.AppendMenu(MF_SEPARATOR);
-	cmPopUp.AppendMenuW(MF_STRING, CLEAR_LIST, _T("Clear List"));
-
-	CRect windowRect;
-	this->GetWindowRect(&windowRect);
-	POINT pp;
-	GetCursorPos(&pp);
-	POINT x = this->GetCaretPos();
-	ClientToScreen(&x);
-	x.y += windowRect.Height();
-
-	cmPopUp.TrackPopupMenu(TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RIGHTBUTTON, x.x, x.y, this, NULL);
-	
-	Invalidate();
-	
-	return true;
-}
-
-void CSymbolEdit::DestroyIcon()
-{
-	// if icon was loaded internally, destroy it
-	if (m_bInternalIcon || m_hSymbolIcon != NULL)
-		::DestroyIcon(m_hSymbolIcon);
-}
-
-void CSymbolEdit::PreSubclassWindow()
-{
-	RecalcLayout();
-}
-
-void CSymbolEdit::SetSymbolIcon(HICON hIcon, BOOL redraw)
-{
-	DestroyIcon();
-
-	m_hSymbolIcon = hIcon;
-
-	// icon was not loaded internally
-	m_bInternalIcon = false;
-
-	RecalcLayout();
-
-	if (redraw)
-		Invalidate(TRUE);
-}
-
-void CSymbolEdit::SetSymbolIcon(UINT id, BOOL redraw)
-{
-	DestroyIcon();
-
-	m_hSymbolIcon = (HICON)::LoadImage(
-		AfxGetResourceHandle(),
-		MAKEINTRESOURCE(id),
-		IMAGE_ICON,
-		16,
-		16,
-		LR_DEFAULTCOLOR | LR_LOADTRANSPARENT);
-
-	ASSERT(m_hSymbolIcon != NULL);
-
-	// icon was loaded internally
-	m_bInternalIcon = true;
-
-	RecalcLayout();
-
-	if (redraw)
-		Invalidate(TRUE);
-}
-
-void CSymbolEdit::SetPromptText(CString text, BOOL redraw)
-{
-	m_strPromptText = text;
-
-	if (redraw)
-		Invalidate(TRUE);
-}
-
-void CSymbolEdit::SetPromptText(LPCTSTR szText, BOOL redraw)
-{
-	m_strPromptText = szText;
-
-	if (redraw)
-		Invalidate(TRUE);
-}
-
-void CSymbolEdit::SetPromptTextColor(COLORREF color, BOOL redraw)
-{
-	m_colorPromptText = color;
-
-	if (redraw)
-		Invalidate(TRUE);
-}
-
-void CSymbolEdit::SetPromptFont(CFont& font, BOOL redraw)
-{
-	LOGFONT lf;
-	memset(&lf, 0, sizeof(LOGFONT));
-
-	font.GetLogFont(&lf);
-	SetPromptFont(&lf);
-
-	if (redraw)
-		Invalidate(TRUE);
-}
-
-void CSymbolEdit::SetPromptFont(const LOGFONT* lpLogFont, BOOL redraw)
-{
-	m_fontPrompt.DeleteObject();
-	m_fontPrompt.CreateFontIndirect(lpLogFont);
-
-	if (redraw)
-		Invalidate(TRUE);
-}
-
-void CSymbolEdit::RecalcLayout()
-{
-	int width = GetSystemMetrics(SM_CXSMICON);
-
-	if (m_hSymbolIcon)
-	{
-		DWORD dwMargins = GetMargins();
-		SetMargins(LOWORD(dwMargins), width + 6);
-	}
-	else
-	{
-		if (m_windowDpi != NULL)
-		{
-			SetMargins(m_windowDpi->Scale(4), m_windowDpi->Scale(34));
-		}
-	}
-}
-
-// CSymbolEdit message handlers
-
-void CSymbolEdit::OnPaint()
-{
-	CPaintDC dc(this);
-
-	CRect rect;
-	GetClientRect(&rect);
-
-	DWORD margins = GetMargins();
-	
-	CRect textRect(rect);
-	textRect.left += LOWORD(margins);
-	textRect.right -= HIWORD(margins);
-
-	// Clearing the background
-	dc.FillSolidRect(rect, GetSysColor(COLOR_WINDOW));	
-
-	if (m_hSymbolIcon)
-	{
-		// Drawing the icon
-		int width = GetSystemMetrics(SM_CXSMICON);
-		int height = GetSystemMetrics(SM_CYSMICON);
-
-		::DrawIconEx(
-			dc.m_hDC,
-			rect.right - width - 1,
-			1,
-			m_hSymbolIcon,
-			width,
-			height,
-			0,
-			NULL,
-			DI_NORMAL);
-
-		rect.left += LOWORD(margins) + 1;
-		rect.right -= (width + 7);
-	}
-	else
-	{
-		//rect.left += (LOWORD(dwMargins) + 1);
-		//rect.right -= (HIWORD(dwMargins) + 1);
-	}
-
-	CString text;
-	GetWindowText(text);
-	CFont* oldFont = NULL;
-
-	//rect.top += 1;
-
-
-	if(this == GetFocus() || text.GetLength() > 0)
-	{
-		dc.FillSolidRect(rect, g_Opt.m_Theme.SearchTextBoxFocusBG());
-
-		oldFont = dc.SelectObject(GetFont());		
-
-		COLORREF oldColor = dc.GetTextColor();
-		dc.SetTextColor(g_Opt.m_Theme.SearchTextBoxFocusText());
-			
-		dc.DrawText(text, textRect, DT_SINGLELINE | DT_INTERNAL | DT_EDITCONTROL | DT_NOPREFIX);
-
-		dc.SelectObject(oldFont);
-		dc.SetTextColor(oldColor);
-	}
-	else
-	{
-		dc.FillSolidRect(rect, g_Opt.m_Theme.MainWindowBG());
-	}
-
-
-	if (text.GetLength() == 0 && m_strPromptText.GetLength() > 0)
-	{
-		//if we aren't showing the close icon, then use the full space
-		textRect.right += m_windowDpi->Scale(16);
-		//textRect.right -= LOWORD(margins);
-
-		oldFont = dc.SelectObject(&m_fontPrompt);
-		COLORREF color = dc.GetTextColor();
-		dc.SetTextColor(m_colorPromptText);
-
-		dc.DrawText(m_strPromptText, textRect, DT_LEFT | DT_SINGLELINE | DT_EDITCONTROL | DT_VCENTER | DT_NOPREFIX);
-		dc.SetTextColor(color);
-		dc.SelectObject(oldFont);
-	}
-
-	int right = rect.right;
-	if ((text.GetLength() > 0 || this == GetFocus()))
-	{
-		m_searchesButtonRect.SetRect(rect.right - m_windowDpi->Scale(18), 0, rect.right, rect.bottom);
-		right = rect.right - m_windowDpi->Scale(18);
-		m_searchesButton.Draw(&dc, *m_windowDpi, this, m_searchesButtonRect.left, 4, m_mouseHoveringOverSearches, m_mouseDownOnSearches);
-	}
-	else
-	{
-		m_searchesButtonRect.SetRect(0, 0, 0, 0);
-		//m_searchButton.Draw(&dc, this, rect.right - 22, 4, false, false);
-	}
-
-	if (text.GetLength() > 0)
-	{
-		OutputDebugString(_T("showing close button\n"));
-
-		m_closeButtonRect.SetRect(right - m_windowDpi->Scale(16), 0, right, rect.bottom);
-		m_closeButton.Draw(&dc, *m_windowDpi, this, m_closeButtonRect.left, 4, m_mouseHoveringOverClose, m_mouseDownOnClose);
-	}
-	else
-	{
-		OutputDebugString(_T("not showing close button\n"));
-		m_closeButtonRect.SetRect(0, 0, 0, 0);
-		//m_searchButton.Draw(&dc, this, rect.right - 22, 4, false, false);
-	}
-
-	//OutputDebugString(_T("OnPaint"));
-
-}
-
-void CSymbolEdit::OnSize(UINT nType, int cx, int cy)
-{
-	CEdit::OnSize(nType, cx, cy);
-
-	RecalcLayout();
-}
-
-LRESULT CSymbolEdit::OnSetFont(WPARAM wParam, LPARAM lParam)
-{
-	DefWindowProc(WM_SETFONT, wParam, lParam);
-
-	RecalcLayout();
-
-	return 0;
-}
-
-HBRUSH CSymbolEdit::CtlColor(CDC* pDC, UINT n)
-{
-	if (::GetFocus() == m_hWnd)
-	{
-		pDC->SetTextColor(g_Opt.m_Theme.SearchTextBoxFocusText());
-		pDC->SetBkColor(g_Opt.m_Theme.SearchTextBoxFocusBG());
-		return CreateSolidBrush(g_Opt.m_Theme.SearchTextBoxFocusBG());
-	}
-	else
-	{
-		pDC->SetBkColor(g_Opt.m_Theme.MainWindowBG());
-		return CreateSolidBrush(g_Opt.m_Theme.MainWindowBG());
-	}
-}
-
-void CSymbolEdit::OnSetFocus(CWnd* pOldWnd)
-{
-	Invalidate(FALSE);
-	CEdit::OnSetFocus(pOldWnd);
-
-	CWnd *pWnd = GetParent();
-	if (pWnd)
-	{
-		if (g_Opt.m_bFindAsYouType)
-		{
-			pWnd->SendMessage(NM_FOCUS_ON_SEARCH, 0, 0);
-		}
-	}
-}
-
-void CSymbolEdit::OnKillFocus(CWnd* pNewWnd)
-{
-	AddToSearchHistory();
-
-	Invalidate(FALSE);
-	CEdit::OnKillFocus(pNewWnd);
-}
-
-BOOL CSymbolEdit::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
-{
-	CPoint pntCursor;
-	GetCursorPos(&pntCursor);
-	ScreenToClient(&pntCursor);
-
-	if(m_closeButtonRect.PtInRect(pntCursor))
-	{
-		HCURSOR h = ::LoadCursor(NULL, IDC_ARROW);
-		::SetCursor(h);
-		return TRUE;
-	}
-
-	if (m_searchesButtonRect.PtInRect(pntCursor))
-	{
-		HCURSOR h = ::LoadCursor(NULL, IDC_ARROW);
-		::SetCursor(h);
-		return TRUE;
-	}
-
-	return CEdit::OnSetCursor(pWnd, nHitTest, message);
-}
-
-void CSymbolEdit::OnLButtonUp(UINT nFlags, CPoint point)
-{
-	if (m_mouseDownOnClose)
-	{
-		ReleaseCapture();
-		InvalidateRect(m_closeButtonRect);
-	}
-
-	if (m_mouseDownOnSearches)
-	{
-		ReleaseCapture();
-		InvalidateRect(m_searchesButtonRect);
-	}
-
-	m_mouseDownOnClose = false;
-	m_mouseDownOnSearches = false;
-
-	if (m_closeButtonRect.PtInRect(point))
-	{
-		if ((GetWindowTextLength() > 0))
-		{
-			CWnd *pOwner = GetOwner();
-			if (pOwner)
-			{
-				pOwner->SendMessage(NM_CANCEL_SEARCH, 0, 0);
-			}
-		}		
-	}	
-
-	if (m_searchesButtonRect.PtInRect(point))
-	{
-		this->ShowSearchHistoryMenu();
-	}
-
-	CEdit::OnLButtonUp(nFlags, point);
-}
-
-void CSymbolEdit::OnLButtonDown(UINT nFlags, CPoint point)
-{
-	if (m_closeButtonRect.PtInRect(point))
-	{
-		m_mouseDownOnClose = true;
-		SetCapture();
-		InvalidateRect(m_closeButtonRect);
-	}
-	else
-	{
-		m_mouseDownOnClose = false;
-	}
-
-	if (m_searchesButtonRect.PtInRect(point))
-	{
-		m_mouseDownOnSearches = true;
-		SetCapture();
-		InvalidateRect(m_searchesButtonRect);
-	}
-	else
-	{
-		m_mouseDownOnSearches = false;
-	}
-
-	CEdit::OnLButtonDown(nFlags, point);
-}
-
-void CSymbolEdit::OnMouseMove(UINT nFlags, CPoint point)
-{
-	if (m_closeButtonRect.PtInRect(point))
-	{
-		if (m_mouseHoveringOverClose == false)
-		{
-			m_mouseHoveringOverClose = true;
-			InvalidateRect(m_closeButtonRect);
-		}
-	}
-	else if(m_mouseHoveringOverClose)
-	{
-		m_mouseHoveringOverClose = false;
-		InvalidateRect(m_closeButtonRect);
-	}
-
-	if (m_searchesButtonRect.PtInRect(point))
-	{
-		if (m_mouseHoveringOverSearches == false)
-		{
-			m_mouseHoveringOverSearches = true;
-			InvalidateRect(m_searchesButtonRect);
-		}
-	}
-	else if (m_mouseHoveringOverSearches)
-	{
-		m_mouseHoveringOverSearches = false;
-		InvalidateRect(m_searchesButtonRect);
-	}
-
-	CEdit::OnMouseMove(nFlags, point);
-}
-
-void CSymbolEdit::OnSelectSearchString(UINT idIn)
-{
-	int index = idIn - RANGE_START;
-
-	if (idIn == CLEAR_LIST)
-	{
-		m_searches.RemoveAll();
-	}
-	else if (index >= 0 &&
-		index < m_searches.GetCount())
-	{
-		CString cs = m_searches[index];
-		this->SetWindowTextW(cs);
-
-		this->SetFocus();
-		this->SetSel(-1);
-
-		this->Invalidate();
-
-		m_searches.RemoveAt(index);
-		m_searches.Add(cs);
-	}
-}
-
-bool CSymbolEdit::ApplyLastSearch()
-{
-	bool ret = false;
-	if (m_searches.GetCount() > 0)
-	{
-		CString cs = m_searches[m_searches.GetCount()-1];
-		this->SetWindowTextW(cs);
-
-		this->SetFocus();
-		this->SetSel(-1);
-
-		this->Invalidate();
-
-		ret = true;
-	}
-
-	return ret;
-}
-
-void CSymbolEdit::OnDpiChanged()
-{
-	SetDpiInfo(m_windowDpi);
-}
-
-void CSymbolEdit::SetDpiInfo(CDPI *dpi)
-{ 
-	m_windowDpi = dpi; 
-
-	m_closeButton.Reset();
-	m_closeButton.LoadStdImageDPI(m_windowDpi->GetDPI(), search_close_16, Search_20, Search_24, Search_28, Search_32, _T("PNG"));
-
-	m_searchesButton.Reset();
-	m_searchesButton.LoadStdImageDPI(m_windowDpi->GetDPI(), down_16, down_20, down_24, down_28, down_32, _T("PNG"));
-
-	RecalcLayout();
+// AeroEdit.cpp : implementation file
+//
+
+#include "stdafx.h"
+#include "SymbolEdit.h"
+#include "cp_main.h"
+#include "QListCtrl.h"
+#include "Shared\TextConvert.h"
+
+// CSymbolEdit
+
+#define RANGE_START 3000
+#define CLEAR_LIST 3050
+#define LIST_MAX_COUNT 50
+
+IMPLEMENT_DYNAMIC(CSymbolEdit, CEdit)
+
+CSymbolEdit::CSymbolEdit() :
+	m_hSymbolIcon(NULL),
+	m_bInternalIcon(false),
+	m_colorPromptText(RGB(127, 127, 127))
+{
+	m_fontPrompt.CreateFont(
+		16,                        // nHeight
+		0,                         // nWidth
+		0,                         // nEscapement
+		0,                         // nOrientation
+		FW_NORMAL,                 // nWeight
+		TRUE,                      // bItalic
+		FALSE,                     // bUnderline
+		0,                         // cStrikeOut
+		DEFAULT_CHARSET,           // nCharSet
+		OUT_DEFAULT_PRECIS,        // nOutPrecision
+		CLIP_DEFAULT_PRECIS,       // nClipPrecision
+		DEFAULT_QUALITY,           // nQuality
+		DEFAULT_PITCH | FF_SWISS,  // nPitchAndFamily
+		_T("Calibri"));
+
+	m_mouseDownOnSearches = false;
+	m_mouseHoveringOverSearches = false;
+	m_mouseDownOnClose = false;
+	m_mouseHoveringOverClose = false;
+	m_windowDpi = NULL;
+
+	//m_searchButton.LoadStdImageDPI(Search_16, Search_20, Search_24, Search_32, _T("PNG"));
+	
+}
+
+CSymbolEdit::~CSymbolEdit()
+{
+	DestroyIcon();
+}
+
+
+BEGIN_MESSAGE_MAP(CSymbolEdit, CEdit)
+	ON_WM_PAINT()
+	ON_MESSAGE(WM_SETFONT, OnSetFont)
+	//ON_MESSAGE(WM_EXITMENULOOP, OnMenuExit)
+	ON_WM_CTLCOLOR_REFLECT()
+	ON_WM_SETFOCUS()
+	ON_WM_KILLFOCUS()
+	ON_WM_SETCURSOR()
+	ON_WM_LBUTTONUP()
+	ON_WM_LBUTTONDOWN()
+	ON_WM_MOUSEMOVE()
+	ON_COMMAND_RANGE(RANGE_START, (RANGE_START+ LIST_MAX_COUNT), OnSelectSearchString)
+	ON_WM_EXITSIZEMOVE()
+END_MESSAGE_MAP()
+
+BOOL CSymbolEdit::PreTranslateMessage(MSG* pMsg)
+{
+	// TODO: Add your specialized code here and/or call the base class
+	// Intercept Ctrl + Z (Undo), Ctrl + X (Cut), Ctrl + C (Copy), Ctrl + V (Paste) and Ctrl + A (Select All)
+	// before CEdit base class gets a hold of them.
+	if (pMsg->message == WM_KEYDOWN &&
+		CONTROL_PRESSED)
+	{
+		switch (pMsg->wParam)
+		{
+		case 'Z':
+			Undo();
+			return TRUE;
+		case 'X':
+			Cut();
+			return TRUE;
+		case 'C':
+			{
+				int startChar;
+				int endChar;
+				this->GetSel(startChar, endChar);
+				if (startChar == endChar)
+				{
+					CWnd *pWnd = GetParent();
+					if (pWnd)
+					{
+						pWnd->SendMessage(NM_COPY_CLIP, pMsg->wParam, pMsg->lParam);
+					}
+				}
+				else
+				{
+					Copy();
+				}
+			}
+			return TRUE;
+		case 'V':
+			Paste();
+			return TRUE;
+		case 'A':
+			SetSel(0, -1);
+			return TRUE;
+		}
+	}
+
+	switch (pMsg->message)
+	{
+	case WM_KEYDOWN:
+	{
+		if (pMsg->wParam == VK_RETURN)
+		{
+			CWnd *pWnd = GetParent();
+			if (pWnd)
+			{
+				if (g_Opt.m_bFindAsYouType)
+				{
+					pWnd->SendMessage(NM_SEARCH_ENTER_PRESSED, 0, 0);
+				}
+				else
+				{
+					//Send a message to the parent to refill the lb from the search
+					pWnd->PostMessage(CB_SEARCH, 0, 0);
+				}
+
+				AddToSearchHistory();
+			}
+
+			return TRUE;
+		}
+		else if (pMsg->wParam == VK_DOWN &&
+			((GetKeyState(VK_CONTROL) & 0x8000) || ((GetKeyState(VK_CONTROL) & 0x8000) && (GetKeyState(VK_SHIFT) & 0x8000))))
+		{
+			if (ShowSearchHistoryMenu())
+			{
+				return TRUE;
+			}
+		}
+		else if (pMsg->wParam == VK_DOWN ||
+			pMsg->wParam == VK_UP ||
+			pMsg->wParam == VK_PRIOR ||
+			pMsg->wParam == VK_NEXT)
+		{
+			CWnd *pWnd = GetParent();
+			if (pWnd)
+			{
+				pWnd->SendMessage(CB_UPDOWN, pMsg->wParam, pMsg->lParam);
+				return TRUE;
+			}
+		}
+		else if (pMsg->wParam == VK_DELETE)
+		{
+			int startChar;
+			int endChar;
+			this->GetSel(startChar, endChar);
+			CString cs;
+			this->GetWindowText(cs);
+			//if selection is at the end then forward this on to the parent to delete the selected clip
+			if(startChar == cs.GetLength() &&
+				endChar == cs.GetLength())
+			{ 
+				CWnd *pWnd = GetParent();
+				if (pWnd)
+				{
+					pWnd->SendMessage(NM_DELETE, pMsg->wParam, pMsg->lParam);
+					return TRUE;
+				}
+			}
+		}
+		break;
+	}
+	}
+
+	return CEdit::PreTranslateMessage(pMsg);
+}
+
+CString CSymbolEdit::SavePastSearches()
+{
+	TiXmlDocument doc;
+
+	TiXmlElement* outer = new TiXmlElement("PastSearches");
+	doc.LinkEndChild(outer);
+
+	int count = (int)m_searches.GetCount();
+	for (int i = 0; i < count; i++)
+	{		
+		TiXmlElement* searchElement = new TiXmlElement("Search");
+
+		CStringA t;
+		CTextConvert::ConvertToUTF8(m_searches[i], t);
+		searchElement->SetAttribute("text", t);
+
+		outer->LinkEndChild(searchElement);
+	}
+
+	TiXmlPrinter printer;
+	printer.SetLineBreak("");
+	doc.Accept(&printer);
+	CString cs = printer.CStr();
+
+	return cs;
+}
+
+void CSymbolEdit::LoadPastSearches(CString values)
+{
+	m_searches.RemoveAll();
+
+	TiXmlDocument doc;
+	CStringA xmlA;
+	CTextConvert::ConvertToUTF8(values, xmlA);
+	doc.Parse(xmlA);
+
+	TiXmlElement *ItemHeader = doc.FirstChildElement("PastSearches");
+
+	if (ItemHeader != NULL)
+	{
+		TiXmlElement *ItemElement = ItemHeader->FirstChildElement();
+
+		while (ItemElement)
+		{
+			CString item = ItemElement->Attribute("text");
+
+			m_searches.Add(item);
+
+			ItemElement = ItemElement->NextSiblingElement();
+		}
+	}
+}
+
+void CSymbolEdit::AddToSearchHistory()
+{
+	CString cs;
+	this->GetWindowText(cs);
+	if (cs != _T(""))
+	{
+		if (m_searches.GetCount() >= LIST_MAX_COUNT)
+		{
+			m_searches.RemoveAt(0);
+		}
+
+		bool existing = false;
+		int count = (int)m_searches.GetCount();
+		for (int i = 0; i < count; i++)
+		{
+			if (m_searches[i] == cs)
+			{
+				m_searches.RemoveAt(i);
+				m_searches.Add(cs);
+				existing = true;
+				break;
+			}
+		}
+
+		if (existing == false)
+		{
+			m_searches.Add(cs);
+		}
+	}
+}
+
+bool CSymbolEdit::ShowSearchHistoryMenu()
+{
+	if (m_searches.GetCount() == 0)
+	{
+		return false;
+	}
+
+	CMenu cmPopUp;
+	cmPopUp.CreatePopupMenu();
+
+	int count = min((int)m_searches.GetCount(), LIST_MAX_COUNT);
+	for (int i = count-1; i >= 0; i--)
+	{
+		CString text = m_searches[i];
+
+		if (i == count - 1 &&
+			m_lastSearchShortCut.Key > 0)
+		{
+			CString cmdShortcutText = CHotKey::GetHotKeyDisplayStatic(m_lastSearchShortCut.Key);
+			if (m_lastSearchShortCut.Key2 != 0)
+			{
+				CString cmdShortcutText2 = CHotKey::GetHotKeyDisplayStatic(m_lastSearchShortCut.Key2);
+
+				if (cmdShortcutText2.GetLength() > 0)
+				{
+					cmdShortcutText += _T(" - ");
+					cmdShortcutText += cmdShortcutText2;
+				}
+			}
+
+			text += "\t";
+			text += cmdShortcutText;
+		}
+
+		cmPopUp.AppendMenuW(MF_STRING, (RANGE_START + i), text);
+	}
+
+	cmPopUp.AppendMenu(MF_SEPARATOR);
+	cmPopUp.AppendMenuW(MF_STRING, CLEAR_LIST, _T("Clear List"));
+
+	CRect windowRect;
+	this->GetWindowRect(&windowRect);
+	POINT pp;
+	GetCursorPos(&pp);
+	POINT x = this->GetCaretPos();
+	ClientToScreen(&x);
+	x.y += windowRect.Height();
+
+	cmPopUp.TrackPopupMenu(TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RIGHTBUTTON, x.x, x.y, this, NULL);
+	
+	Invalidate();
+	
+	return true;
+}
+
+void CSymbolEdit::DestroyIcon()
+{
+	// if icon was loaded internally, destroy it
+	if (m_bInternalIcon || m_hSymbolIcon != NULL)
+		::DestroyIcon(m_hSymbolIcon);
+}
+
+void CSymbolEdit::PreSubclassWindow()
+{
+	RecalcLayout();
+}
+
+void CSymbolEdit::SetSymbolIcon(HICON hIcon, BOOL redraw)
+{
+	DestroyIcon();
+
+	m_hSymbolIcon = hIcon;
+
+	// icon was not loaded internally
+	m_bInternalIcon = false;
+
+	RecalcLayout();
+
+	if (redraw)
+		Invalidate(TRUE);
+}
+
+void CSymbolEdit::SetSymbolIcon(UINT id, BOOL redraw)
+{
+	DestroyIcon();
+
+	m_hSymbolIcon = (HICON)::LoadImage(
+		AfxGetResourceHandle(),
+		MAKEINTRESOURCE(id),
+		IMAGE_ICON,
+		16,
+		16,
+		LR_DEFAULTCOLOR | LR_LOADTRANSPARENT);
+
+	ASSERT(m_hSymbolIcon != NULL);
+
+	// icon was loaded internally
+	m_bInternalIcon = true;
+
+	RecalcLayout();
+
+	if (redraw)
+		Invalidate(TRUE);
+}
+
+void CSymbolEdit::SetPromptText(CString text, BOOL redraw)
+{
+	m_strPromptText = text;
+
+	if (redraw)
+		Invalidate(TRUE);
+}
+
+void CSymbolEdit::SetPromptText(LPCTSTR szText, BOOL redraw)
+{
+	m_strPromptText = szText;
+
+	if (redraw)
+		Invalidate(TRUE);
+}
+
+void CSymbolEdit::SetPromptTextColor(COLORREF color, BOOL redraw)
+{
+	m_colorPromptText = color;
+
+	if (redraw)
+		Invalidate(TRUE);
+}
+
+void CSymbolEdit::SetPromptFont(CFont& font, BOOL redraw)
+{
+	LOGFONT lf;
+	memset(&lf, 0, sizeof(LOGFONT));
+
+	font.GetLogFont(&lf);
+	SetPromptFont(&lf);
+
+	if (redraw)
+		Invalidate(TRUE);
+}
+
+void CSymbolEdit::SetPromptFont(const LOGFONT* lpLogFont, BOOL redraw)
+{
+	m_fontPrompt.DeleteObject();
+	m_fontPrompt.CreateFontIndirect(lpLogFont);
+
+	if (redraw)
+		Invalidate(TRUE);
+}
+
+void CSymbolEdit::RecalcLayout()
+{
+	int width = GetSystemMetrics(SM_CXSMICON);
+
+	if (m_hSymbolIcon)
+	{
+		DWORD dwMargins = GetMargins();
+		SetMargins(LOWORD(dwMargins), width + 6);
+	}
+	else
+	{
+		if (m_windowDpi != NULL)
+		{
+			SetMargins(m_windowDpi->Scale(4), m_windowDpi->Scale(34));
+		}
+	}
+}
+
+// CSymbolEdit message handlers
+
+void CSymbolEdit::OnPaint()
+{
+	CPaintDC dc(this);
+
+	CRect rect;
+	GetClientRect(&rect);
+
+	DWORD margins = GetMargins();
+	
+	CRect textRect(rect);
+	textRect.left += LOWORD(margins);
+	textRect.right -= HIWORD(margins);
+
+	// Clearing the background
+	dc.FillSolidRect(rect, GetSysColor(COLOR_WINDOW));	
+
+	if (m_hSymbolIcon)
+	{
+		// Drawing the icon
+		int width = GetSystemMetrics(SM_CXSMICON);
+		int height = GetSystemMetrics(SM_CYSMICON);
+
+		::DrawIconEx(
+			dc.m_hDC,
+			rect.right - width - 1,
+			1,
+			m_hSymbolIcon,
+			width,
+			height,
+			0,
+			NULL,
+			DI_NORMAL);
+
+		rect.left += LOWORD(margins) + 1;
+		rect.right -= (width + 7);
+	}
+	else
+	{
+		//rect.left += (LOWORD(dwMargins) + 1);
+		//rect.right -= (HIWORD(dwMargins) + 1);
+	}
+
+	CString text;
+	GetWindowText(text);
+	CFont* oldFont = NULL;
+
+	//rect.top += 1;
+
+
+	if(this == GetFocus() || text.GetLength() > 0)
+	{
+		dc.FillSolidRect(rect, g_Opt.m_Theme.SearchTextBoxFocusBG());
+
+	
+		CPen pen(PS_SOLID, 0, g_Opt.m_Theme.SearchTextBoxFocusBorder());
+		CPen* pOldPen = dc.SelectObject(&pen);
+
+		dc.Rectangle(rect);
+
+		rect.DeflateRect(1, 1, 1, 1);
+		textRect.DeflateRect(1, 1, 1, 1);
+
+		dc.SelectObject(pOldPen);
+
+		oldFont = dc.SelectObject(GetFont());		
+
+		COLORREF oldColor = dc.GetTextColor();
+		dc.SetTextColor(g_Opt.m_Theme.SearchTextBoxFocusText());
+			
+		dc.DrawText(text, textRect, DT_SINGLELINE | DT_INTERNAL | DT_EDITCONTROL | DT_NOPREFIX | DT_VCENTER);
+
+		dc.SelectObject(oldFont);
+		dc.SetTextColor(oldColor);
+	}
+	else
+	{
+		dc.FillSolidRect(rect, g_Opt.m_Theme.MainWindowBG());
+	}
+
+
+	if (text.GetLength() == 0 && m_strPromptText.GetLength() > 0)
+	{
+		//if we aren't showing the close icon, then use the full space
+		textRect.right += m_windowDpi->Scale(16);
+		//textRect.right -= LOWORD(margins);
+
+		oldFont = dc.SelectObject(&m_fontPrompt);
+		COLORREF color = dc.GetTextColor();
+		dc.SetTextColor(m_colorPromptText);
+
+		dc.DrawText(m_strPromptText, textRect, DT_LEFT | DT_SINGLELINE | DT_EDITCONTROL | DT_VCENTER | DT_NOPREFIX);
+		dc.SetTextColor(color);
+		dc.SelectObject(oldFont);
+	}
+
+	int right = rect.right;
+	if ((text.GetLength() > 0 || this == GetFocus()))
+	{
+		m_searchesButtonRect.SetRect(rect.right - m_windowDpi->Scale(18), 0, rect.right, rect.bottom);
+		right = rect.right - m_windowDpi->Scale(18);
+		m_searchesButton.Draw(&dc, *m_windowDpi, this, m_searchesButtonRect.left, 4, m_mouseHoveringOverSearches, m_mouseDownOnSearches);
+	}
+	else
+	{
+		m_searchesButtonRect.SetRect(0, 0, 0, 0);
+		//m_searchButton.Draw(&dc, this, rect.right - 22, 4, false, false);
+	}
+
+	if (text.GetLength() > 0)
+	{
+		OutputDebugString(_T("showing close button\n"));
+
+		m_closeButtonRect.SetRect(right - m_windowDpi->Scale(16), 0, right, rect.bottom);
+		m_closeButton.Draw(&dc, *m_windowDpi, this, m_closeButtonRect.left, 4, m_mouseHoveringOverClose, m_mouseDownOnClose);
+	}
+	else
+	{
+		OutputDebugString(_T("not showing close button\n"));
+		m_closeButtonRect.SetRect(0, 0, 0, 0);
+		//m_searchButton.Draw(&dc, this, rect.right - 22, 4, false, false);
+	}
+
+	//OutputDebugString(_T("OnPaint"));
+
+}
+
+void CSymbolEdit::OnSize(UINT nType, int cx, int cy)
+{
+	CEdit::OnSize(nType, cx, cy);
+
+	RecalcLayout();
+}
+
+LRESULT CSymbolEdit::OnSetFont(WPARAM wParam, LPARAM lParam)
+{
+	DefWindowProc(WM_SETFONT, wParam, lParam);
+
+	RecalcLayout();
+
+	return 0;
+}
+
+HBRUSH CSymbolEdit::CtlColor(CDC* pDC, UINT n)
+{
+	if (::GetFocus() == m_hWnd)
+	{
+		pDC->SetTextColor(g_Opt.m_Theme.SearchTextBoxFocusText());
+		pDC->SetBkColor(g_Opt.m_Theme.SearchTextBoxFocusBG());
+		return CreateSolidBrush(g_Opt.m_Theme.SearchTextBoxFocusBG());
+	}
+	else
+	{
+		pDC->SetBkColor(g_Opt.m_Theme.MainWindowBG());
+		return CreateSolidBrush(g_Opt.m_Theme.MainWindowBG());
+	}
+}
+
+void CSymbolEdit::OnSetFocus(CWnd* pOldWnd)
+{
+	Invalidate(FALSE);
+	CEdit::OnSetFocus(pOldWnd);
+
+	CWnd *pWnd = GetParent();
+	if (pWnd)
+	{
+		if (g_Opt.m_bFindAsYouType)
+		{
+			pWnd->SendMessage(NM_FOCUS_ON_SEARCH, 0, 0);
+		}
+	}
+}
+
+void CSymbolEdit::OnKillFocus(CWnd* pNewWnd)
+{
+	AddToSearchHistory();
+
+	Invalidate(FALSE);
+	CEdit::OnKillFocus(pNewWnd);
+}
+
+BOOL CSymbolEdit::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
+{
+	CPoint pntCursor;
+	GetCursorPos(&pntCursor);
+	ScreenToClient(&pntCursor);
+
+	if(m_closeButtonRect.PtInRect(pntCursor))
+	{
+		HCURSOR h = ::LoadCursor(NULL, IDC_ARROW);
+		::SetCursor(h);
+		return TRUE;
+	}
+
+	if (m_searchesButtonRect.PtInRect(pntCursor))
+	{
+		HCURSOR h = ::LoadCursor(NULL, IDC_ARROW);
+		::SetCursor(h);
+		return TRUE;
+	}
+
+	return CEdit::OnSetCursor(pWnd, nHitTest, message);
+}
+
+void CSymbolEdit::OnLButtonUp(UINT nFlags, CPoint point)
+{
+	if (m_mouseDownOnClose)
+	{
+		ReleaseCapture();
+		InvalidateRect(m_closeButtonRect);
+	}
+
+	if (m_mouseDownOnSearches)
+	{
+		ReleaseCapture();
+		InvalidateRect(m_searchesButtonRect);
+	}
+
+	m_mouseDownOnClose = false;
+	m_mouseDownOnSearches = false;
+
+	if (m_closeButtonRect.PtInRect(point))
+	{
+		if ((GetWindowTextLength() > 0))
+		{
+			CWnd *pOwner = GetOwner();
+			if (pOwner)
+			{
+				pOwner->SendMessage(NM_CANCEL_SEARCH, 0, 0);
+			}
+		}		
+	}	
+
+	if (m_searchesButtonRect.PtInRect(point))
+	{
+		this->ShowSearchHistoryMenu();
+	}
+
+	CEdit::OnLButtonUp(nFlags, point);
+}
+
+void CSymbolEdit::OnLButtonDown(UINT nFlags, CPoint point)
+{
+	if (m_closeButtonRect.PtInRect(point))
+	{
+		m_mouseDownOnClose = true;
+		SetCapture();
+		InvalidateRect(m_closeButtonRect);
+	}
+	else
+	{
+		m_mouseDownOnClose = false;
+	}
+
+	if (m_searchesButtonRect.PtInRect(point))
+	{
+		m_mouseDownOnSearches = true;
+		SetCapture();
+		InvalidateRect(m_searchesButtonRect);
+	}
+	else
+	{
+		m_mouseDownOnSearches = false;
+	}
+
+	CEdit::OnLButtonDown(nFlags, point);
+}
+
+void CSymbolEdit::OnMouseMove(UINT nFlags, CPoint point)
+{
+	if (m_closeButtonRect.PtInRect(point))
+	{
+		if (m_mouseHoveringOverClose == false)
+		{
+			m_mouseHoveringOverClose = true;
+			InvalidateRect(m_closeButtonRect);
+		}
+	}
+	else if(m_mouseHoveringOverClose)
+	{
+		m_mouseHoveringOverClose = false;
+		InvalidateRect(m_closeButtonRect);
+	}
+
+	if (m_searchesButtonRect.PtInRect(point))
+	{
+		if (m_mouseHoveringOverSearches == false)
+		{
+			m_mouseHoveringOverSearches = true;
+			InvalidateRect(m_searchesButtonRect);
+		}
+	}
+	else if (m_mouseHoveringOverSearches)
+	{
+		m_mouseHoveringOverSearches = false;
+		InvalidateRect(m_searchesButtonRect);
+	}
+
+	CEdit::OnMouseMove(nFlags, point);
+}
+
+void CSymbolEdit::OnSelectSearchString(UINT idIn)
+{
+	int index = idIn - RANGE_START;
+
+	if (idIn == CLEAR_LIST)
+	{
+		m_searches.RemoveAll();
+	}
+	else if (index >= 0 &&
+		index < m_searches.GetCount())
+	{
+		CString cs = m_searches[index];
+		this->SetWindowTextW(cs);
+
+		this->SetFocus();
+		this->SetSel(-1);
+
+		this->Invalidate();
+
+		m_searches.RemoveAt(index);
+		m_searches.Add(cs);
+	}
+}
+
+bool CSymbolEdit::ApplyLastSearch()
+{
+	bool ret = false;
+	if (m_searches.GetCount() > 0)
+	{
+		CString cs = m_searches[m_searches.GetCount()-1];
+		this->SetWindowTextW(cs);
+
+		this->SetFocus();
+		this->SetSel(-1);
+
+		this->Invalidate();
+
+		ret = true;
+	}
+
+	return ret;
+}
+
+void CSymbolEdit::OnDpiChanged()
+{
+	SetDpiInfo(m_windowDpi);
+}
+
+void CSymbolEdit::SetDpiInfo(CDPI *dpi)
+{ 
+	m_windowDpi = dpi; 
+
+	m_closeButton.Reset();
+	m_closeButton.LoadStdImageDPI(m_windowDpi->GetDPI(), search_close_16, Search_20, Search_24, Search_28, Search_32, _T("PNG"));
+
+	m_searchesButton.Reset();
+	m_searchesButton.LoadStdImageDPI(m_windowDpi->GetDPI(), down_16, down_20, down_24, down_28, down_32, _T("PNG"));
+
+	RecalcLayout();
 }

SymbolEdit.h

@@ -1,119 +1,119 @@
-/************************************************************************/
-/* Created by MARIUS BANCILA
-/*            www.mariusbancila.ro
-/* Copyright (C) 2008 MARIUS BANCILA. All rights reserved.
-/*
-/* Permission is given by the author to freely redistribute and
-/* include this code in any program as long as this credit is
-/* given where due.
-/*
-/* CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-/* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-/* INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE CODE
-/* IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
-/* OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
-/* PERFORMANCE OF THE CODE IS WITH YOU. SHOULD ANY
-/* CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL
-/* DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
-/* NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
-/* WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE
-/* OF ANY CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-/* THIS DISCLAIMER.
-/*
-/************************************************************************/
-
-
-
-#pragma once
-
-#include "GdiImageDrawer.h"
-#include "Accels.h"
-#include "DPI.h"
-
-// CSymbolEdit
-
-class CSymbolEdit : public CEdit
-{
-	DECLARE_DYNAMIC(CSymbolEdit)
-
-	CFont m_fontPrompt;
-	HICON m_hSymbolIcon;
-	bool m_bInternalIcon;
-	CString m_strPromptText;
-	COLORREF m_colorPromptText;
-
-	void DestroyIcon();
-
-public:
-	CSymbolEdit();
-	virtual ~CSymbolEdit();
-
-	virtual BOOL PreTranslateMessage(MSG* pMsg);
-
-	void AddToSearchHistory();
-
-	bool ShowSearchHistoryMenu();
-
-	void SetSymbolIcon(HICON hIcon, BOOL redraw = TRUE);
-	void SetSymbolIcon(UINT id, BOOL redraw = TRUE);
-
-	void SetPromptText(CString text, BOOL redraw = TRUE);
-	void SetPromptText(LPCTSTR szText, BOOL redraw = TRUE);
-
-	void SetPromptTextColor(COLORREF color, BOOL redraw = TRUE);
-
-	void SetPromptFont(CFont& font, BOOL redraw = TRUE);
-	void SetPromptFont(const LOGFONT* lpLogFont, BOOL redraw = TRUE);
-
-	bool ApplyLastSearch();
-
-	void SetLastSearchAccel(CAccel a) { m_lastSearchShortCut = a; }
-
-	CString SavePastSearches();
-	void LoadPastSearches(CString values);
-
-	void SetDpiInfo(CDPI *dpi);
-
-	void OnDpiChanged();
-
-protected:
-	
-	//CGdiImageDrawer m_searchButton;
-	CGdiImageDrawer m_closeButton;
-	CRect m_closeButtonRect;
-	bool m_mouseDownOnClose;
-	bool m_mouseHoveringOverClose;
-
-	CGdiImageDrawer m_searchesButton;
-	CRect m_searchesButtonRect;
-	bool m_mouseDownOnSearches;
-	bool m_mouseHoveringOverSearches;
-
-	CAccel m_lastSearchShortCut;
-
-	CStringArray m_searches;
-
-	void RecalcLayout();
-	virtual void PreSubclassWindow();
-
-	CDPI *m_windowDpi;
-
-	afx_msg void OnSize(UINT nType, int cx, int cy);
-	afx_msg LRESULT OnSetFont(WPARAM wParam, LPARAM lParam);
-	//afx_msg LRESULT OnMenuExit(WPARAM wParam, LPARAM lParam);
-	afx_msg HBRUSH CtlColor(CDC* pDC, UINT n);
-	afx_msg void OnSetFocus(CWnd* pOldWnd);
-	afx_msg void OnKillFocus(CWnd* pNewWnd);
-	afx_msg BOOL OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message);
-	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
-	afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
-	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
-	afx_msg void OnSelectSearchString(UINT idIn);
-
-	DECLARE_MESSAGE_MAP()
-
-public:
-	afx_msg void OnPaint();
-};
-
-
+/************************************************************************/
+/* Created by MARIUS BANCILA
+/*            www.mariusbancila.ro
+/* Copyright (C) 2008 MARIUS BANCILA. All rights reserved.
+/*
+/* Permission is given by the author to freely redistribute and
+/* include this code in any program as long as this credit is
+/* given where due.
+/*
+/* CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+/* WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+/* INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE CODE
+/* IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE
+/* OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
+/* PERFORMANCE OF THE CODE IS WITH YOU. SHOULD ANY
+/* CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL
+/* DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
+/* NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
+/* WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE
+/* OF ANY CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER
+/* THIS DISCLAIMER.
+/*
+/************************************************************************/
+
+
+
+#pragma once
+
+#include "GdiImageDrawer.h"
+#include "Accels.h"
+#include "DPI.h"
+
+// CSymbolEdit
+
+class CSymbolEdit : public CEdit
+{
+	DECLARE_DYNAMIC(CSymbolEdit)
+
+	CFont m_fontPrompt;
+	HICON m_hSymbolIcon;
+	bool m_bInternalIcon;
+	CString m_strPromptText;
+	COLORREF m_colorPromptText;
+
+	void DestroyIcon();
+
+public:
+	CSymbolEdit();
+	virtual ~CSymbolEdit();
+
+	virtual BOOL PreTranslateMessage(MSG* pMsg);
+
+	void AddToSearchHistory();
+
+	bool ShowSearchHistoryMenu();
+
+	void SetSymbolIcon(HICON hIcon, BOOL redraw = TRUE);
+	void SetSymbolIcon(UINT id, BOOL redraw = TRUE);
+
+	void SetPromptText(CString text, BOOL redraw = TRUE);
+	void SetPromptText(LPCTSTR szText, BOOL redraw = TRUE);
+
+	void SetPromptTextColor(COLORREF color, BOOL redraw = TRUE);
+
+	void SetPromptFont(CFont& font, BOOL redraw = TRUE);
+	void SetPromptFont(const LOGFONT* lpLogFont, BOOL redraw = TRUE);
+
+	bool ApplyLastSearch();
+
+	void SetLastSearchAccel(CAccel a) { m_lastSearchShortCut = a; }
+
+	CString SavePastSearches();
+	void LoadPastSearches(CString values);
+
+	void SetDpiInfo(CDPI *dpi);
+
+	void OnDpiChanged();
+
+protected:
+	
+	//CGdiImageDrawer m_searchButton;
+	CGdiImageDrawer m_closeButton;
+	CRect m_closeButtonRect;
+	bool m_mouseDownOnClose;
+	bool m_mouseHoveringOverClose;
+
+	CGdiImageDrawer m_searchesButton;
+	CRect m_searchesButtonRect;
+	bool m_mouseDownOnSearches;
+	bool m_mouseHoveringOverSearches;
+
+	CAccel m_lastSearchShortCut;
+
+	CStringArray m_searches;
+
+	void RecalcLayout();
+	virtual void PreSubclassWindow();
+
+	CDPI *m_windowDpi;
+
+	afx_msg void OnSize(UINT nType, int cx, int cy);
+	afx_msg LRESULT OnSetFont(WPARAM wParam, LPARAM lParam);
+	//afx_msg LRESULT OnMenuExit(WPARAM wParam, LPARAM lParam);
+	afx_msg HBRUSH CtlColor(CDC* pDC, UINT n);
+	afx_msg void OnSetFocus(CWnd* pOldWnd);
+	afx_msg void OnKillFocus(CWnd* pNewWnd);
+	afx_msg BOOL OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message);
+	afx_msg void OnLButtonDown(UINT nFlags, CPoint point);
+	afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
+	afx_msg void OnMouseMove(UINT nFlags, CPoint point);
+	afx_msg void OnSelectSearchString(UINT idIn);
+
+	DECLARE_MESSAGE_MAP()
+
+public:
+	afx_msg void OnPaint();
+};
+
+

Theme.cpp

@@ -49,6 +49,8 @@ void CTheme::LoadDefaults()
 	m_mainWindowBG = RGB(240, 240, 240);
 	m_searchTextBoxFocusBG = RGB(255, 255, 255);
 	m_searchTextBoxFocusText = RGB(0, 0, 0);
+	m_searchTextBoxFocusBorder = RGB(255, 255, 255);
+	m_searchTextHighlight = RGB(255, 0, 0);
 
 	m_groupTreeBG = RGB(240, 240, 240);
 	m_groupTreeText = RGB(127, 127, 127);
@@ -165,6 +167,8 @@ bool CTheme::Load(CString csTheme, bool bHeaderOnly, bool bCheckLastWriteTime)
 	LoadColor(ItemHeader, "MainWindowBG", m_mainWindowBG);
 	LoadColor(ItemHeader, "SearchTextBoxFocusBG", m_searchTextBoxFocusBG);
 	LoadColor(ItemHeader, "SearchTextBoxFocusText", m_searchTextBoxFocusText);
+	LoadColor(ItemHeader, "SearchTextBoxFocusBorder", m_searchTextBoxFocusBorder);
+	LoadColor(ItemHeader, "SearchTextHighlight", m_searchTextHighlight);
 
 	LoadColor(ItemHeader, "Border", m_Border);
 	LoadColor(ItemHeader, "BorderTopMost", m_BorderTopMost);
@@ -198,6 +202,8 @@ void CTheme::LoadWindowsAccentColor()
 		auto b = GetBValue(accent);
 
 		m_clipPastedColor = RGB(b, g, r);
+		m_searchTextBoxFocusBorder = m_clipPastedColor;
+		m_searchTextHighlight = m_clipPastedColor;
 
 		//if (Windows10ColorTitleBar())
 		//{

Theme.h

@@ -36,6 +36,8 @@ public:
 	COLORREF MainWindowBG() const { return m_mainWindowBG; }
 	COLORREF SearchTextBoxFocusBG() const { return m_searchTextBoxFocusBG; }
 	COLORREF SearchTextBoxFocusText() const { return m_searchTextBoxFocusText; }
+	COLORREF SearchTextBoxFocusBorder() const { return m_searchTextBoxFocusBorder; }
+	COLORREF SearchTextHighlight() const { return m_searchTextHighlight; }
 
 	COLORREF GroupTreeBG() const { return m_groupTreeBG; }
 	COLORREF GroupTreeText() const { return m_groupTreeText; }
@@ -84,6 +86,8 @@ protected:
 	COLORREF m_BorderNotConnected;
 	COLORREF m_searchTextBoxFocusBG;
 	COLORREF m_searchTextBoxFocusText;
+	COLORREF m_searchTextBoxFocusBorder;
+	COLORREF m_searchTextHighlight;
 
 	COLORREF m_groupTreeBG;
 	COLORREF m_groupTreeText;